I think that any modification to the PCM will void the warranty, but if you have a tuner (Predator, Xcal 2, etc.) you can just return the stock program and nobody will be the wiser. What you probably need to do is get a handheld tuner and re-flash your PCM every time you change something...