Sounds like you should get some compatible repeating devices BEFORE you start adding your existing devices.
Happiness comes from having a strong MESH