Forget any kind of WYSIWYG software for building pages. You're already comfortable with code, just code the pages by hand.
I can't address any of the book choices, but as far as references on the web, nothing beats W3schools.com. Simple, organized, easy to search comprehensive reference for all Web technologies.
As far as manipulation of graphics, yes, Photoshop is the industry standard, but then I'm not a graphics guy.