Sounds like a map generator issue. Having them switch around could help or bother some. The upside is, someone not near one might have one spawn closer. The downside being, someone that might use one a lot for trades or whatever could find themselves without one.
Mobility already sucks, if anything, the next map should just have them generated in a much more even fashion.
The idea of whirlpools, I'd hope, is a temporary fix to the... less than optimal way of traversing. Whole concept is ridiculous. Structures meant for fast traveling large distances are basically useless aside from alt spawning lol