Not focusing on the WiFi problem I would start with upgrade to 7.24.5 as it has no security problems.
Maybe it would resolve your problem too. If not, you can check 7.25rc1 as :
wifi - fix CAPsMAN failing when mangle marking is used with encrypted data channels;
wifi - fix channel reselect interval/time operation for wifi-qcom-be and wifi-mediatek interfaces;
wifi - fix incorrect scan results for 320 MHz access points;
wifi - fix MLD link type change and SA query in station mode;
wifi - fix per-link client statistics for MLO connections;
wifi - fix SAE authentication using a wrong cached PMK;
wifi - fix station statistics not updating after switching MLD links;
wifi - fix the interworking network type;
wifi - fix the wrong band shown in the registration table;
wifi - fix traffic processing on CAPsMAN after an interface is disabled;