The Ride Buck Wild sounds better suited to your needs:
Ride Buck Wild Snowboard 2012
The Machete is a stiff board regardless of what Ride rates it on the Flex meter. The Buck Wild is more playful, but the sacrifice is stability on steeper/faster terrain. It's not super unstable though so you can probably work around that.
But then again, the Agent isn't exactly a soft board either so you might transition nicely to a Machete haha. Machete is stiffer than Agent all around. Agent is a bit stiffer than the Buck Wild. Buck Wild has the most torsional give out of the three.