Oil/Water Sending Units-need to be moved

I have problems with my factory Oil sending unit placement on my 340, the threads were bad and I tapped them as much as I could, finally getting a plug in place of the oil sending unit behind distributor, need a new location for the original sending unit to placed.......Seems to me i saw a unit placed on the passenger side of an engine once, ??? Also a suggestion for moving the water sending unit on my Old Old Edelbrock intake somewhere else, Ive ben trying to take it out and replace it, fearing Ill break it off... suggestions for a move there...Im going to try and heat up the engine and then try to get the b#^$@#! out....... Thanks