I do about the same thing, just apply spray on wax after I use waterless car wash…that is mostly water. I do cheat, I have found the ground to be too far away to clean wheel pants, I trained my Arrow to tuck the wheels up into the wings. I do have to fix a lot of stone chips on my flaps. On the advice of a Corvette owning friend, I have clay barred my plane. The clay bar and the wax have made the 1993 paint look almost new