Never been on a CC, but from what I've read, moving up to a Heritage isn't going to help with the playful/flexible parts.
I was going to suggest a Rider's Choice as that has a mid-flex and is pretty fun and fast too.
Legacy seems more like it than the Heritage. Or even the Proto X if you're sticking with NS.
Maybe someone with CC experience can help, but is the Legacy/ProtoX even more playful than the CC? I''m thinking you need to bump down to the Evo especially since you say better results in the park.