Will I need to re-ring my pistons?

You won't have to, but if the shop didn't do the heads right, how do you know what they did to the rest?
Not sure what you mean. I did the assembly myself. I cleaned everything thoroughly when I got it all home. This was about fifteen years ago. Engine runs well, just smokes and has the carbon build up.