Be careful with the Poly. It will look good but when it's time to redo it it is a real pain to get off. G&S Marine has a great wax called Shultzies. Not sold anywhere else.
I know a guy that went over his boat with 1000 wet/dry grit sand paper lightly and was amazed!! the thing looked like the day it came out the show room!