I got better results without the sub-surf modifier, on the circular pieces.BTW, be sure to set the Tiles X and Y (under Performance) to 4096 for quicker baking.
Good tip! And go with whatever gives the best results!