04 5.7 Truck motor what heads to get to upgrade?

TTI 6.1 headers. TTI EXHAUST, 6.1 aluminum intake with manifold adapters from Modern Muscle. I do plan on a cam swap. Would the 6.1 heads work better or have my current heads reworked and upgrade rods as well. I’m more concerned of the valve problems with the early heads I have. To get a tune around here is about $500 I don’t know if that’s the norm. Which I would need if I go with a cam too.