Suggestions taken; thank you to everyone. New version here: http://warlight.net/SinglePlayer.aspx?PreviewMap=7816

If this version seems alright, I'll set up a test game in the next day or two.