Here's a fantastic site which maps out scale for you, the "verbose"mode allows you to input your own scale formats as well as those more standard ones which are available. May I suggest that a good scale to learn is the A Harmonic Minor scale since all the notes are natural except for the G#, you may also want to learn diminished scales because the shapes are easy to memorise because they are symmetrical scales with lots of repeating motifs and have only two modes. Also try G Harmonic Major, this is an obscure scale but is only one note different from a major scale and so isn't too strange. These scales are great for adding a bit of heaviness to your playing and you will find some interesting chord progressions if you experiment with them. Personally I also dig B Bhairava scale and G Hungarian major. These are freaky scales for jazz heads and crazy metal heads who like really oppresive scale forms. Good luck, have fun.

http://www.power-chord.com/gaff/mapper/?verbose=1