If you go before April 12th, you'll find room rates significantly cheaper and parks a bit quieter.

A 2br villa in Bay Lake Tower is ideal - if you can get one. You have a double and a sofabed in one room, a king in the other and a double & single sofabed in the lounge. I don't believe Disney hotels will confirm connecting rooms in advance, they're only on request. You're walking distance to the Magic Kingdom and the pool has a quirky little slide in it, too.

Note that the rates expedia is showing at the minute for Disney hotels are far lower than Disney in the US can offer (or at least that was the case 10 days back).

One other thing to consider is the pricing of park tickets - they're really expensive for the first few days then drop to just $10/day but sounds like you'll just have to suck this up. Maybe consider getting longer dated tickets with the no expiry option as it seems likely you'll go back at some point.

Bear in mind that if you don't stay right next to the park you want to be in, you might actually be better off just staying at the Marriott Villas (Imperial Palms etc) and driving in. The time it'll take will be little different!