1200mk,
You should be OK with this, but if you want a bit more shine/gloss you could step down to the #3 Machine Glaze or #7 Show Car. Those are lower in scale than the SFP and will glaze it very well.
If you want to go to the 3M line, 3M PIII-FG since you are waxing, since it contains carnuba in it as well.
Another product, sometimes a bit tuff to remove or work is Menzerna FP, but when you get the hang of it, it brings out a great shine. I used it just with a grey finish pad as I want the polish and NOT the pad AND polish to work the finish, just the polish so I can obtain the best level of gloss.
You could even use a hand glaze if you choose, but they take time.
I's stick to what you're doing with the #82, look at it and then decide if you need more gloss. Then choose one of the above aforementioned and check again.
Gold Class may contain cleaners, I'm not sure. If you want, switch to a pure carnuba such as #26 over the polishes, this way there are no cleaners and just straight carnuba. Or, go to a bike shop, pick-up some S100 and try that. Most of the guys use this for a wax and have found it gives excelent results!
You could also go to a sealer or polymer such as Megs #20, Zaino, Klasse, BF etc. A bit different in prep (polish as before, but you MUST strip oils from polishes off for them to bond to the finish) and some use Dawn wash to strip the oils/silicones others use Alcohol/water mix. That's the only big issue is oils left from polishes interfering with a poly sealant bonding correctly.
Regards,
Deanski