Ok, I think my problem is solved thanks to Craig's Cobras.
In the second diagram in the link below he shows alternate plumbing for the water pump bypass hose and heater. If I switch over to this, I should be able to put an inline tee fitting for the EFI's CTS in the now lengthen bypass line up be the manifold and have engine temp coolant flowing past it all the time.
I'm headed this route over drill a tap of my manifold unless anyone sees issues with it. There is just not much room on my manifold around the MSD distributor and the other sensors so it would turn out like a bit of a cluster.
Aluminum Head Thread Repair