[JohnN]

absolutely the Swan, it's a non-disney hotel owned by Westin,
but adjacent to the Boardwalk, and you can take the "boat" to both Epcot and Disney Studios (aka MGM)

it's a very nice hotel, reasonbly priced (sometimes specials)