Yeah leave the cv joint bolts unless you can find new ones.

Make sure you take off all the blue coating before you send them for zinc, you'll get a better finish.

Power steering pipes were also done