Soda Can Mock-Up

Having some real problems getting the smart-object to wrap properly on the can to give it the top part and the main part in one smart-object.

Had to surrender and made the top of the label as a separate smart-object. Anyone have any suggestions on how to make this in one piece?

Will release this as a freebie when I have cleaned it up a bit! :)