Thank you Craggles. - To all PS users, if you were not aware of clipping layers (as opposed to clipping masks) then you really need to watch this tutorial.

It answers a lot of questions on using masks within masks to keep the editing of your map truly non-destructive.