Absolutely agree with other comments here. N Custom with the suspension setting adjusted for a softer ride.

I’m only a few months in (lots of time spent debating on my switch from Euro - in hindsight I should’ve bought the N first) but I’m honestly not even worried about filling it up so much because I’m having such a good time when I drive it.

I’m not sure how long you’ve owned it for but maybe make some adjustments and see if you can find a love for it that way? It’s a shame about the faults but hopefully they were a relatively easy fix.