Cross off that STC fitting upgrade. You don't have that fitting on your 04.
I would recommend Ford head gaskets. The gaskets are not a weak design, it is the stock head bolts that were the problem.
Try Tousley Ford for all your Ford parts. They are a dealership out of Minnesota that sells Ford Factory parts at 10% over dealer cost. You won't find them anywhere any cheaper than that. 800-328-9552.
ARP head studs for $398
, the cheapest I have ever seen.
If you want an upgraded HPOP, and never want to have an issue again in the future, and have a grand to drop for the pump, I would go with the Dieselsite Adrenaline HPOP. CLICK ME
to check it out.
If you are rolling in the dough and never want to worry about your oil cooler, the Bulletproof Diesel oil cooling system is THE way to go. CLICK ME
to check that out. You will need the cold weather kit if you ever see snowplows in the winter. The above link will show you the three different ways to buy the kit. Just pay attention to what year it is designed for, whether or not you want their egr cooler, and whether or not you want the cold weather kit.