John - you're right, but of course everything has worked perfectly for the last three years (even the CC switches on the old layout), so this issue of some of the CC switches randomly switching or not being able to be programmed on the new layout was just not anticipated. 
Chuck - by the "terminal" on the adapter, you're talking about the small, open metal tab ? I'll try as you suggest, I just wasn't sure that a hot water pipe connected back to a boiler is ground, like the main water line coming into the house (heating pipes to left of photo), but I understand it will at least act to extend the antenna, anyway.
