Thank You!You're talking about coming from EPCOT, right? I believe it is BoardWalk, Yacht & Beach Club and the Swan and Dolphin Resorts, and from DHS, it is the opposite order.
And yes, the boat pickup is by the International Gateway (between France and UK)
Register on WDWMAGIC. This sidebar will go away, and you'll see fewer ads.