Soo, I just did the same thing - Went from '09 X2 to '13 X25. I would also add that we surf a lot too. I had my surf wake dialed on the 2. We have not put but about 20 minutes surfing on the new motor (sorry engine, whatever) but have also surfed the 30.

From first experience and if you want a huge and long surf wake on the X25 you will need extra ballast in bags or people to sink this boat, even with tabs.

Stock ballast comparison with 3 people in the boat is about the same between the two, but I would give the edge to the X30.

Based on that alone, maybe the 30, however for me, sorry X30 owners, not knocking the boat just my opinion. X25 all the way!

X30
Not a Fan of the Swinging Rear Seat - Cool Fan watching idea, but functionally blocks getting to the transom of the boat
Not a pointy bow guy - see above
Not 100% sold on the hips

As far as motors (sorry again, engines) 6.2 all the way
All I can say is it's is breath taking, jumps on plane and just hums at 3000 RPM waiting for you to open her up. running right about 28 mph @ 3000 RPM's Early estimate on gas is about 6 GPH

Obviously you'll want to test them both yourself, but the general consensus is that the X-25 has an outstanding wakeboard wake and a nearly outstanding surf wake while the X-30 has and outstanding surf wake and a nearly outstanding surf wake. Since you say you mostly surf, I'd say the X-30 is the boat for you if the wake is your only criteria. I think most would agree both boats are good enough at both wakeboarding and surfing that you'd be happy with either one and could safely choose based on which one offers a better interior layout, storage, etc. that fits how you use the boat.

As for your other points... The X-25 is fine with the 5.7 engine. Is it better with the 6.0 or 6.2? Sure, but it functions well with the 5.7. I recently got the X-25 with the 5.7 and was a little worried, but have been pleasantly surprised. The only time I wish I had a bigger engine is when I'm pulling the kids tube as the deep v hull does bleed off more speed than I was used to in turns, so the 5.7 has to work a little harder to accelerate the X-25 out of turns.

Pickle fork vs traditional: Overrated difference. You'll get used to and love either one once you're having fun with the boat.

I disagree, big time. The pickle fork opens up the bow to the point where going back to a traditonal bow would be extremely difficult.

Those of you who know you can't capture Canadian Blue Flake's awesomeness on camera, it's needs to be experienced in real life.

I went 25 for wakeboard wake, picklefork, rough water ride, and easier to fit in garage.

I'd love to have the X30's surf wake though, also like that you can stick 750's in the rear and have a killer surf wake all plumbed whereas with the X25 even with 450's in the rear plumbed in you need extra weight.

hahaha i just ready that "may be illegal". so adding ballast which basically puts you over the "legal" limit on your capacity plate isn't illegal or is ok.

It does make me laugh, none of the posted mastercraft youtubes has anyone ever sitting in those seats while someone is surfing, however on the lake that's all you see is people sitting in those seats or sitting on the back platform.

I can honestly say that I have never felt like the bow was small on my 30, in fact it seems very roomy. Both have lots of storage, but the 30 has more. My kids crawl from the bow to the rear lockers all underneath the cushions. They call it the tunnel. At any time there are 12+ life jackets, a couple surf boards, a couple anchors, 5-6 wetsuits, cleaning supplies, 2 big blankets, paddles, and a bunch of other stuff all hidden under seats and there is still a ton of storage. Oh, and some lead too.

As for the rear seat, everyone LOVES that feature and we use it all the time. Even camped out on the boat last summer and used it as a bed and it was perfect. I know for our family we would use it at least twice as much as the rear seats on the 25. Kids love sitting here to watch boarding or surfing too. I would never let kids seat in the rear 25 seats while underway.

As for wakes, both are awesome. X-25 is supposed to be the best stock wake going. What I like about the 30 wakeboard wake is how clean it is at all speeds and you can keep throwing weight at it and it keeps getting bigger without washing out. I had a finicky wake before on my last boat and it gets old.

Good luck with the decision, can't really make a wrong choice.

__________________
2013 X-30, 6.0L with 2500lbs of ballast and 500 lbs of lead.