[Loren]

I do agree that dismiss would be a big help but still it would require keeping doing it.

A better solution I think:

1) No aquatic freespawn. They should all be amphibious so you can do something with them once you own the water.

2) The idea of new unit routing that's already been discussed in other threads.