I had P0420 code. Turns out it was the cat. If your going to do it I wouldn't wait because when I brought mine in it was the last month it was covered under warranty.
Just be sure everything is ok and in order with all else on the car. They will try and find any reason to charge you for something. Also make sure your oil level is not high.