Thanks for all your help. I tore it back apart tonight, everything looked OK, but I was careful to get it back together and everything zip tied up out of the way. Took it for a short drive tonight, and everything seemed normal (which has always been the case after replacing the temp sensor anyway).
Going to pick up some conduit to make sure there is no contact between the wires and the top of the block (where the harness Y junction is between the MAF and the temp sensor). I'll update this thread in a few months if the problem truly was my faulty wiring before.