I have the same problem, the bottom line from the bypass to the hot water heater is uphill with a 90 degree connection to the tank. A few years ago it froze and caused a leak at the plex pipe hookup.
I now run a little antifreeze to the tank before I change the bypass or blow it out first.
__________________
|