I'm looking for a recommendation for a replacement wall switch unit. The new WIFI unit is great but I have two units that are about 95% functional. The repeat command use to fix this but I see no way to add another sunset timer so I'm going to replace them. I have already replaced a lamp module with a PLM04 and now it's 100%. The other unit is a Wall Switch for a outside lighting. I'm looking at the XPS4 because of AGC. But open to any other wall switch recommendation that can improve reliability. Note already have coupler, filters and boosters. Most of my modules are over 30 years old so I'm fine replacing it if I can get to 100%.