Trek geometry g2, reduce the angle of the head and pull the rear wheel near the seat.
Niner is not. I do not know how Niner will be better, but you should go before making a decision.
But you bought a whole new bike, what makes you think you should buy another car?