The above products will work. However using the hot cloth method, if you're careful, you generally won't need to re-polish or wax.