I use Black Magic on my equipment. You might also try the Storm Resurfacing System. It's a set of three compounds which gradually bring the surface up and add sheen at the same time. The 2nd Dimension comes OOB with Step 2 of the Storm Resurfacing System. The HyRoad (which you didn't mention, but just to give you an idea) comes OOB with Step 3 of the System.
Good luck :-)