Unable to reconnect to data

Hello everyone, glad to see there is a OnePlus tribe already here! I love my OPO, just been having some trouble lately where if I'm on WiFi too long (typically when I wake up in the morning) and I leave WiFi, I can't connect to my data network (T-Mobile) unless I either

1) Turn on/off airplane mode a few times 2) Reboot the phone

Have any of you had this issue? I've seen this mentioned before on the OnePlus subreddit, but never any resolution other than to flash my phone. I'd like to find an easier solution if possible (google has let me down already). Any advice would be appreciated!