Default Wifi issues do I need to switch while I still can

I just got the s4 and its total stock but it keeps dropping on and off wifi. In fact in settings it sometimes says I have poor wifi conection. But I know my router is good and my wifes g2 has no problems. I read online there is alot of issues sinve the 4.3 update and even after the patch. I also read samsung is not going to do anything there blaming sprint or your wifi. Should I switch to the g2 while I still can or hold out for a fix or does anyone know a fix?

Sent from my SPH-L720 using XDA Premium 4 mobile app