For the heads a Valve Job with a a valve seat cutter not grinder, is the first step you want to do. If you have the budget do a mild port & polish next with gasket matching on BOTH sides. ONLY doing the heads & not the lower plenum can create unwanted affects.