Moved from ZBT-1 and ZHA to ZBT-2 and Z2M - how to optimize network? Reach good but not great

Per title, I had been running HA for years with a directly attached SkyConnect and ZHA. My new Sonoff hose timers were supposed to have more support in Z2M so I purchased the ZBT-2 and moved everything over.

While SkyConnect was in the basement, I used an unused rPi4 and Portainer/Docker to run Zigbee2MQTT and have the ZBT-2 connected to that on the first floor of the house. It is in the same room (right under) an Omada AP but I think that is fine based on the channels. Omada is on Ch 11 for 2.4 and 36 for 5 GHz; the ZBT-2 is on channel 25.

I also have 6 Zigbee outlets throughout the house (3 Nous and 3 Sonoff 31s). Despite that, the LQI for some devices seems low at 60 in the kitchen (line of sight with ZBT-2) and 68 for an outside Sonoff hose timer while the timer right next to it is fine at 92. There is a Third reality leak detector in the basement pantry at LQI of 52 with an outlet Zigbee device opposite one wall with an LQI of 80.

Oh and after moving all devices, I changed the SkyConnect to be a Thread Border router.

Would appreciate any help in optimizing the network. Thanks!

Are you seeing any latency or missed commands? If not, leave everything alone & don’t worry about the numbers.

ZHA & Z2M use different ways of calculating LQI, plus there have been reports that the ZBT-2 shows a lower LQI than the SkyConnect, even with the same Zigbee integration.

Just to rule out USB interference, make sure you’re using a USB2 port on the Pi4 & not the blue USB3 ones. USB3 causes interference in the 2.4G spectrum which zigbee uses.
Make sure the ZBT2 is as far away from the Pi as the cable allows.
Be extremely careful if you’re swapping your USB port connection from USB3 to USB2 - if you defined your adapter path using the device path instead of the serial path, you’ll have to change your Z2M config since device path changes when you change port.