The Contemporary also has a marina, and they probably have the Whalers available as well. They're on Bay Lake, which is connected to the Seven Seas by the water bridge. Check with your resort's concierge desk to make sure they have them.
The Contemporary is just a 10 minute walk from the MK bus area, or one stop on the Resort Monorail. (The GF is 4 stops.) And there is a boat from the Contemporary directly to FtW, for the HDD.