On the return lines topic, 7 years ago or so I made myself a set while I was in machining school. Just made some aluminum cylinders with a hole bored out and a lip on top, and then drilled and tapped 1/16" NPT threads for little hose barbs.
The machining part worked, but I had trouble keeping burrs from nicking the O-rings.
Also still had trouble with sealing, despite using a tighter tolerance etc.
After I figured out that wheel bearing grease solves the leaking problem, I haven't worried about those caps or any others since. I just grab any old set of plastic caps(stock ones are getting brittle), and install them with a liberal helping of high-temp lithium grease.
It's almost a miracle when it comes to O-ring sealing. I've had no more issues since, even with disturbing the caps. I've done the procedure on 4 trucks so far, and had no issues with it.
Last time I had a leak on one after doing the caps, I pulled the cap to find... a pine needle! Just pulled the needle out, cleaned and re-greased the cap, and reinstalled. Done deal.
And that last truck, the 93 in my avatar... I just grabbed the absolute cheapest kit I could find on ebay. Still worked just fine; no issues with fit or finish, and no leaks(once I got the pine needle out).
As such, while I think metal return caps are cool... I personally don't think it matters anymore. A good set of hose should last 10+ years easily, and you'll probably need to replace the injectors themselves in that time.