Don't be afraid to dive into your normal map and do some painting, often the bake is a starting point not the final result. =) A lot of the waves could be wiped out by dragging a vertical row of pixels, horizontally. If more of the pieces where straight, it would be pretty easy to eradicate 95% of the waviness that way. I…
Awsome! Thanks alot for the description and also the script for the UV's :) Thanks! Renderhjs and Timwiese: Sorry for the late replies, didnt see your replies till now. Thanks for the tips! I'll definitely check this out! Thanks!
as renderhjs said you should make the edges of the unwrapped cylinders straight for a cleaner unwrap. Here's a good tool to use for that http://www.chuggnut.com/ just goto Scripts>Unwrap Tools These are def looking good so far, you just need to push them a bit further and they will be great pieces.