Well i've got the car back. Apparently all it needed was a new oil switch. Leak has stopped, and mechanic said it doesn't appear to be losing water anymore. Odd.
Ah well, all sorted for under £25 so can't go wrong. Will keep an eye on the water levels over next few days.... not entirely convinced it's all over yet....