I have a hand-drawn version of the map as well, so for the most part I'm tracing the layout in the GIMP, and I'm not that worried about experimenting with labelling at this early stage. I've had the city's basic layout filed away in a dusty corner of my brain for a while now; this is just an exercise in finally putting it down on paper and tidying up the edges.