Yeah, I'd wait for the G21 too. The G series are not the most attractive boat, in my opinion, but man, what a great wake they put out.
The X-10 is an awesome boat too, and hopefully MC will be coming out with a NSS/Surfgate system soon. It's hard to compete without one now. Someone who is buying a boat with primary usage to surf has to really want a Mastercraft to go MC vs. Nautique or Malibu, both of whom also make excellent boats. Or a Centurion Enzo if surfing is all you care about.