i probably wouldnt sweat it; the wiring terminal you talking about may not have been in use, from factory; no way to know, i dont think it makes much difference, ive never seen a factory oil temp for the older 1.6's, or a secondary. a turbo is more in need of a oil temp reading than a na. id stick with a td, a nonturbo motor has little power for a golf, if not as big as a transporter. the 1.6d na was like the slowest production car(s) of their time,,&turbo is much funner
id consider a new wire loom, putting it in,oh what fun, bare copper wires? or just wires run singly? do you have a napa store there? then again iirc you in chezh, plenty of german parts there, or get a used good loom, id perfer new. various wires run around can be a real problem to trace down, fix. a loom install i cannt say is any easier,,?check for someone to do it for you?? you need a good shop 1st.
as for the welds/body fixes, id think of stripping all welds inside and outside, those nooks are weld pockets and porosities. after stripping paint, clean up welds and esp. the pockets, nooks; wire brush(on a drill), or body work attachments, theyll be less than a grinder attach. clean up as best as you can; use metal treatment/prep i stated before, can use for a few days if needed, use around welds and any rust. i think after washing metal prep off you dont clean again is what im saying. use like rust-oleum over welds and treated rust spots. prob then prep rest of the body; inside&outside for painting. use a sealing coat first.
im pointing out im getting to both the front and back of the welds as best i can, i use rust spray for somethings, like the back of welds i cannt get to, maybe because the panel sections overlap, or such, get rustproofing in there at the least.