If your primary goal is to spend less, then you should buy the car you have now.
If you want a bigger car, what about buying the car you have now for $16k and immediately trading it in for a bigger car? Sounds like you could get at least $20k Kelley blue book toward a new car right away.