Kit, absolutely wear the goggles! I'd forgotton to throw my goggles into my swimbag once (I was refreshing the anti-fog coating on it) and I actually went home from the gym to retrieve them rather than face 60 minutes of chlorine in my eyes.
For a great upper body workout, try using paddles or webs on the hands, too. My coach recommends them periodically - but only if your form is good to begin with.
Another great swim-helper is the SportCount lap counter. You wear it on your finger and click it so you don't forget how far you've swam. I'd like to get the swim-mp3 player, too, so I'm saving my pennies.

http://www.sportcount.com/

Have a good swim!