I will be keeping the ZHP until the wheels fall off.
The HPFP sucks, but that's not the reason for leaving the brand when it comes to my next purchase.
The next step up in the BMW brand is an M3. It just doesn't do it for me. So, I will be going elsewhere for my thrills.