The 1.6 GTi was always the better option, even if a bit underpowered by todays standards, plenty of lift-off oversteer potential
Personally mate, if I was in your situation, Id go for something a bit bigger. I had the Micra for 3 and a bit years, and was tired of driving a small underpowered car. I wont suggest getting an Alfa, but myabe something a bit different, with a boot. I cant suggest an actual car yet though, as I dunno what your tastes are. Focus maybe??