I know you are past this, but I am posting this up for others who might be reading it.
For your mapping needs, the Role Playing Game Community has created dozens upon dozens of tools. There are a couple of threads on the subject on www.rpg.net in the main gaming forum (though the D&D forum might also have a thread or two). Or just find any table top RPG forum and search (or post and ask, you will get more live answers).