For removing wax try dna. It should remove a light wax coating and not leave any deposits. Mineral spirits and naptha will cut the wax right off, but may leave a bit of residue behind. And yes, it would be a good idea to remove the existing wax before buffing with a different kind.
Mark Silay recommends Kiwi neutral shoe polish (I think Cindy Drozda also). I haven't tried it but it's supposed to be good for resisting water spots and fingerprints.
Thanks again Doug. The DNA worked well. I rebuffed through Tripoli and white diamond then applied Renaissance wax. I am sold on Renaissance wax. It resists moisture well and looks amazing.