wow! that's a serious case of the Disney bug you have there!!! 
my DH thought we were mad for rebooking for 6 months time when we came back in March though and now he wants to go in April too! (we can't unfortunately, though he still spent an hour looking at prices and trying to convince me!!)
We're there the same time as you. only 3 weeks to go!!!
