Lots of interesting comments, but I don't see anyone debating the pitfalls of laptops.
I am fortnate to have a laptop for work, so I have access to one if I choose. The issue, however, is whether I can lug this thing around, what with the airport size/weight limits. I only have so much carry on room, so do I check the laptop (and chargers, cables, etc.), or my camera? Don't even think about your regs or dive computer. Tough choice.
Still, depending on your budget and luggage considerations, a laptop would be the goal.
I use a Toshiba Satellite. Please, get XP if at all possible. It makes life with photos simpler.
Mine has the dvd (not very usefull for me) rather than the CD burner. Does anyone know what I have to do to install a burner? Do I have to get one from Toshiba, or can I go aftermarket?