Your analogy doesn't really change the situation. The point was I bought a car, not knowing it's modified, for the power I experienced in the test drive. I've never driven another GTI. So from a sales perspective and vehicle disclosure perspective, I thought that was a stock GTI. For the dealer to suggest they have to remove power from the car in order the warranty is unacceptable because that power was what I bought. Regardless of the label you want to put on it, the vehicle I bought is the vehicle I expect to retain. And the warranty I bought is the warranty I expect to retain. That is my default position and only until that option is completely exhausted will I be willing to consider a different remedy.While I'm glad it sounds like you're going to be getting the outcome you want, your analogy doesn't really line up. You didn't buy, or at least intend to buy, a tuned GTI with tuned GTI power. You bought, and expected to get, a stock GTI with stock GTI power. It's more akin to buying an Ecoboost Mustang, then them saying "Sorry, you bought an Ecoboost, but it actually has a 5.0 engine in it. For us to cover it, it has to be brought back to the level you bought.". Now, if they advertised it as an APR Tuned CPO car, or at least that was the assumption it was when you bought it, your analogy would line up. I think the dealer would be perfectly in line to say "We'll honor the CPO warranty, but the tune has to be removed", and let you decide which is more important to you.
Regardless, it doesn't sound like that was the outcome anyway, so you got to have your cake and eat it too.
If all of these had been discovered upfront, before the sale, the situation would be somewhat different. But as it is now, the dealer and I have a contract.