Do as much of it as you can with a block and wet and dry...the smoother you can get it that way, the easier it will be when you come to use the mops and it'll look less rippled as well. Just get a basic 3 peice polishing mop set, theyre around £20, try ebay, I got mine from an M&P motorcycle parts catalogue...but plenty other people do the same kits.

Stu.