Yes I agree that Goldberry has much more affinity to water...though I've wondered before about her name, because she doesn't strike me in any way as resembling nor as interested in berries. =P

OR! If Tom was Eru, Goldberry perhaps could be construed as Eru as well--Eru come down to Arda in a sort of "I'm here to witness myself! Myself, behold myself!" move. Two parallel manifestations of the same divinity interacting. (...oh this is fun.)