After considering so many options I am now keeping the GTi for a few more years. I have ordered a Nissan Leaf to replace the Cactus. Better interior quality than the Hyundia Ioniq, but way worse than the Golf 7; the leather on the steering wheel and seat facings is of a high quality though.