As for the cylinder head issue, if it were mine I'd have the heads you have rebuilt. No sense in buying another head if yours is rebuildable. I'd do both heads too.
Sent from my SAMSUNG-SM-G930A using Tapatalk
Sent from my SAMSUNG-SM-G930A using Tapatalk