switching engines is not an easy option - not as original for resale, wiring loom + ECU issues.
With HGF rebuilding the K series to latest spec is probably best but not cheap option. New LR multi layer gasket, stronger botton rail & head bolts, modified PRT thermostat + inevitable head skim...