I think the main reason I can handle the surprise this time is that we just started planning a month ago. My ideal time to plan a trip is over 6 months, in which case, I think I'd need someone to talk to about it. DH doesn't like nonstop Disney talk. So I think he's actually preferring the surprise, because I can't talk about it as much as I'm prone to do. We have a 'code' word that I use if I need to talk about it (used mostly during the initial planning) but otherwise if I talk about it too much, I'm sure DS would figure it out. That kid has the most precise selective hearing I've ever seen!
He's going to absolutely thrilled when he sees the Magic Bands. That's another reason why it's probably good it's a surprise....if he knew about the MagicBands, they probably would have gone missing by now!