The pic with white arrow is your water temp sensor. It connects to the stock coolant temp guage. As for your other pick of the knock sensor, you are correct that is the knock sensor.

 

Hmmm...That one leads to the ECU. There's a fitting that was part of the main loom but went to the power loom. I'm guessing that one was to the cluster. There's another fitting on the back side of the filler neck which I believe is the level sensor to the ECU. Sound right?

If that connection on the block was supposed to be for the cluster, that would explain why the harness was all jacked up. The lead that was supposed to go to the ECU was rerouted and extended to that connection and the cluster had an extension that went to the filler neck. Someone had this backwards I thinik.

I guess I can just pull that one to the cluster since I have an aftermarket gauge anyway.