Te450 2004 Rebuild Help

Restoring a TE450 04 that needs a full rebuild and having trouble finding parts, have taken inspiration from other threads and changing to a 06 crank and piston as the parts are easily available so will be better long term.
Not having much luck with the head - the top end was done not that long before the bottom end let go, so possibly the valves are ok, but was thinking of changing to the Kibblewhite SS while at at this point.
Has anyone or is it possible to use or modify the 04 head to take the 06/07 valves?
Or can I use the current setup with the 06 piston?