looks like no one else ventures here, and i've not been active in a while.
but in your situation the software doesn't really matter ( that is depending on which route you take)
you have two options, the WYSIWYG route, or the coding route.
for the first i would suggest any version of dreamweaver, as it will give you more freedom that most other applications in it's class. any version will do, i would suggest sticking with your current (that is depending on the version number)
on the coding point of view, anything your comfortable with will do, even if it's textedit, doesn't make a difference at the end of the day.
Computer: Mac Mini Intel Core Duo 1.66GHz, 1GB DDR2 SDRAM, 80GB Internal HDD, 200GB + 400GB External HDD, Bluetooth, 11.2 Surround Sound, Apple Wireless Keybaord, Logitech Trackball, Wacom Graphics Tablet. Mac OS X 10.4.8, Windows Vista Ultimate..
Student: At University of Plymouth, Studying BSc (hons) Web Applications Development