Sort list of GPS waypoints by both Lat and Long, not by Lat then Long.

I don't think you can do better than to annotate each point and sort by that:

Lake Bob Wpt 1
Lake Bob Wpt 2
Lake Bob Wpt 3

Lake Joe Wpt 1
Lake Joe Wpt 2
Lake Joe Wpt 3