How about regen town, with the water present? so you can get a more populated town with the same river or less populated..
Actually, something like that is already implemented: press Shift+ENTER to regenerate a village on the same terrain and with the same highway.
It will be great, if you add this command in description))