That's the way mine is setup also and works well.  I was trying to point out most geo preheat systems do NOT circulate the same water/solution from the field thru the water heater as was described in a post above that had destroyed the hot water heater.

Your house looks very good. You are doing a lot of work yourself.

Jim at Dawn