I may be crazy (I probably am) but I got a really good deal with my Annual Pass on a five night stay at DLP in March 2017, so I went ahead and booked a room only trip for the two of us (can add baby and flights on later). I have multi-risk insurance which should cover me in case for any reason we can't go. We're staying at Sequoia Lodge, which is ideal as it's a short walk from Disney Village, so we can pop back for afternoon naps. WOOHOO I'M GOING BACK TO DLP. And that will kill my cravings until I can next get us to WDW. Unfortunately the new Star Tours won't be open then, as it's right before the 25th Anniversary celebrations, but it was so cheap, I couldn't say no. Happy dance! Now to plan lots of fun baby-friendly activities. 
Congrats!
How on earth did that happen?
I think it will be really good there. Seen lots of Mums with tiny babies in the parks, so I'm pretty confident about it. YAY excited.