So you're cool with tossing another $25,000 out the window? Frankly, getting a wholesale offer from CarMax for another $1000 is the least of your concerns in this situation. If you're bent on a new car, at least analyze the used market and try to sell it yourself to minimize that huge loss before starting the cycle over again. If the dealer is nonchalantly offering $12,000 trade-in, a little patience will probably net you another 30% over that if you sell it yourself, if not more.
I'd actually prefer to get a CPO with a couple thousand miles on it. I've only had the "new car smell" once - every other time, I've gotten pre-owned.