For those interested, here is a picture of the finished install with the generic SWCG. This is about 2-3 weeks ago. It has been running well since then! After doing all this and figuring out the slowest speed my pump can run activating the flow switch (about 1580 rpm), I am thinking now that I should have built in a bypass around the heater to reduce pressure drop so I could run the pump slower at the same flowrate.