I have sorted my woes. I had N.E.A.K installed in 1304, when I upgraded, as I said I wiped dalvik, didn't work. Full factory reset didn't work either, BUT I discovered it doesn't wipe the kernel. Full wipe and reflash of 2204 solved it. However flashing a custom kernel over 2204, breaks the wifi again. How strange.
Sent from my GT-I9100 using XDA