check to see if oil and water are mixing, look for a creamy build up on the oil filler cap / dipstick (wait for the punns to come in....)
get a sniff test done on the water, most garages should be able to do this and its not a big job so dont let them fob you off with high prices as all they do...