Not included in your list, but I just read Mags' return post and her mention of Homewood Suites.
Would that be an option or are you limited by a package? You would have more space and a bit more of a kitchen, which could save you money, particularlyfor breakfast late snacks.
I'm not sure where it's located--I think the one I researched in 2003 was near WDW. There might be one on I-Drive.