I'm just taking the water temperature (at the inlet of the waterblock) to core temperature delta and adding 25C.

25C is an arbitrary choice....I realize most here probably have water temps at closer to 30C, but now that I've been using 25C, I see no reason to not continue to use it.