Have you tried an autocross in the ZHP? May be worth it first before making a major change.

Sent from my pineapple under the sea.