It sounds like you have everything covered. I'd still use the wizard and just re-style the forms because of some of the cool ajax stuff the wizard does, but you can do it manually as you describe.
Your friends over here at WebAssist! These Dreamweaver extensions will assist you in building unlimited, custom websites.
These out-of-the-box solutions provide you proven, tested applications that can be up and running now. Build a store, a gallery, or a web-based email solution.