I'm running aftermarket gauges in my rabbit pickup.
For water temperature, I use Acmeadapters gold rear head water outlet flange. Mounts just like stock and has a port for an aftermarket water temp gauge.
For oil pressure, I just use an 1/8th pipe thread & brass "T" in my oil pressure dummy sensor port on the oil filter housing. Threads are very close to being identical. Both gauges work great.
I do all my diesel converted Suzuki's this way so I know exactly what the motor is doing regarding temp and oil pressure.