Well the official Rapberry PI WiFi antenna arrived, I connected it to the CM4 and it has definitely made an improvement.
The only downside is that it has nowhere to mount to the case.
I’m now going to look at options here, either make a custom cover for the expansion port (I’ve got the 4G board in there) or see if I can print a cover for the top to allow the antenna to fit on the top.