Do not waste your money getting another wrap. Everyone is so concerned about water spots or getting wax on the factory wrap. It is made out to be a larger problem than what it really is.
I waxed my factory wrap and I and very happy with the finished results. Enough so that I will continue doing it. Here is what I did. I used Chemical Guys Deep Reflections XP. I applied it using a Torq orbital polisher with a white Hex pad. I applied it like I would on any other body panel. Then I removed it with a micro fiber towel. It is completely uniform in color and shine. It did give it a little more shine and is closer in appearance to the other parts on the car.
https://www.chemicalguys.com/Deep_Re...gap_321_16.htm