Yeah I hate mapping dungeons too, hence the largely unchanged mountain in Genesis. I should get to work on that some time.
Two gyms sounds pretty decent, I like long betas but two is more than what most have anyway. Be sure to put off releasing the beta until you are 100% happy with it, this is something that I had a huge problem with when I first started. I'm sure you'll do a great job anyway.