Are you absolutely married to those 2 brands?
The reason I ask, is cause there are a few cool wave oriented kites that will work well for freeriding too.
I used to ride Switchblades, and I like them a lot, but as I got more and more into the waves I wanted something quicker, so I did some research, and I personally went with the Switch Methods, they really are awesome kites, but the main thing is bar pressure, but if you're used to the SBs is about the same, perhaps a bit more.
But you've got the Wainmans, it was on my list. And I'm a huge Flexifoil fan, so I tried the Proton, very nice kite, and the Method was a bit quicker, seems that the proton has a bit more low end, but not by much.
I'm also intrigued about the Blade Trigger, which sounds like an awesome all round kite, supposed to be super quick and a ton of range, I'm demoing one this weekend.
I originally wanted a drifter, honestly, mainly cause its cabrinha, and I wanted a trouble free kite, I know the overall quality, etc... but I ened up going with switch, cause I liked what I read, spoke with some former switch team members, and although they weren't with switch anymore liked the kite and had good things to say. And I liked they're principle, they're business model rocks, and I couldn't be happier with its performance. I take it out in flat water and boosts pretty good, just doesn't glide as a bow kite. And when freestyling (basic stuff, no Hadlow) very good.
The drifter I hear is a slower turning kite, like a BWS, I've never tried one so don't quote me on that. I tried a Rally down in Isla Morada, and is a killer kite too, the only think I didn't liked was the bar pressure, way too light for my taste.
The Method V2 is coming out in a few weeks (I think), and offer adjustable bar pressure (I hear), so It would be very promising. Is honestly a killer kite. Go out and demo stuff, the best way to find what works best for you.
Thanks god there are options out there, good luck!