Wax doesn't mask scratches or swirls it protects the paintwork and polish etc...
You would need a polish that's got a bit of filler to help mask the scratches and one with a bit of cut to polish out the swirls, best results are machine polishing but you can get good enough results by hand if it's not that's bad
Where are you based Davo?
Collinite actually slightly fills the scratches making them less obvious.