I'm not going to make suggestions because it's entirely up to you. What ever floats your boat.
Head gasket problems on 7M's aren't a big deal, just put a metal head gasket on with ARP hardware, torque it down to the right specs and you're good to go. Hopefully someone will chime in and shed...