id say swapping to a manual would be good as you could do what i do on the bike or the polo and sit in a higher gear than i need, the bike will do 30 happily in first, but i'll sit in 3rd as it saves petrol, and sounds lovely!!
the polo i just change up so it doesnt blow up!
but yeah a manual you could sit in 5th when your auto would put you in 3rd. then you still have a 350z and your pride!