I use my dual head body buffer like this one https://www.amazon.com/Cyclo-Toolmake...s=cyclo+buffer

I use Mcguires wax with the buffer to take all the scratches out and then I use the wax you're talking about the rest of the time. It does a pretty good job

Dave,
I believe you had mentioned before that you used the aero cosmetic waterless wash and wax? If you do, do you,still use it and what is you likes or dislikes with it? I have to start storing my unit in a warehouse and will not be able to wash it as often as I wish too. So Imam looking for ideas to deal with this issue. Thanks, Bruce