Hi Andrew,
I am going to suggest that you choose a Disney Vacation Club Resort. My reasoning is two-fold.
First, the Walt Disney World Swan and Dolphin hotels are made up of traditional hotel rooms and suites. While these work very well for many families, my family prefers to have a more home-like atmosphere, especially with a young child. My family also includes three people, and we almost always choose to stay in a one-bedroom villa with Disney Vacation Club. This gives not only a living room, bedroom, and at least one bathroom depending on the resort, but also a full kitchen and laundry right in the villa. We get groceries and eat many of our meals in our villa to save time and money. Having laundry in the villa allows us to pack less, which is helpful when traveling by plane. If you decide to include other members of your family in your vacation, you could choose a two- or three-bedroom villa.
Next, the Walt Disney Swan and Dolphin Hotels are lovely, but the theme at each is understated. There are so many themes to chose from in the
Disney Vacation Club Resorts at Walt Disney World which immerse you in the Disney magic. Disney's Beach Club Villas has a quaint beach resort theme, and includes an amazing pool with a sand bottom and zero-entry. Another favorite of mine is Disney's Animal Kingdom Villas - either Kidani Village or Jambo House. The resort is beautiful, and you can see exotic animals outside of nearly ever window!
I do understand that you have points with Walt Disney Swan and Dolphin Hotels, so they may be the best choice for you. If so, you will still be in a fantastic location and be able to enjoy many of the benefits of being a Walt Disney World resort guest.
I would love to help you plan more Andrew; however, I am limited in the space that I have to answer. Please do write back if you have any further questions.