305 wake up / refresh

[TwoFiftyShifter]

Hey all. I have an 84 with a stock 305 4bbl. Starts and runs well but it leaks and smokes. Instead of dealing with a motor swap, I'd like to freshen up the engine. I am thinking some rebuilt Vortec 305 heads, edelbrock intake to keep the Qjet, ram horn type manifolds or headers with duals and redoing the oil pan gasket and rear main. How do you think that will work for the old girl? Would that possibly bump her up from the 160HP 230TQ net ratings stock? I font want any more power I just want the motor to be comfortable pulling around a 4x4 truck.

Also,

If in the future I was to get the Goodwrench 350 replacent motor, would the 305 Vortec heads be an upgrade to the 76cc stock heads for a low rpm type motor?