Buck87

I am in the middle of swapping a long block into my '87 4runner SR5 22re. I need to replace the harness side of two plugs that I pulled the wire out of. So now I only have a bare wire coming out of the harness at the O2 sensor and at the temp sensor and no wire at the plug to splice into. Where can I get new plugs? I know that I could get parts from the junk yard and splice them in, but I'm wondering if there is a cleaner way to do the job.
I also broke the long bolt that holds the water pump onto the engine. Does any one know what length replacement bolt I need to buy?
Thanks

Buck87

Update...I emailed my engine builder (Oregon) and he said that the bolt is 2 3/4" long and offered to mail one to me if I cant find one.