5.1 cell standby & factory resetting

I have a 2013 Moto x that once upgraded to 5.1 had a very significant increase in battery drain due to cell standby. Turning cell data off when connected to wifi helps a little, but it's still 30-60% worse than on 4.4.4 (showing up to 80% of the battery use). I know from searching it's a known issue, some people have mentioned factory resetting - did that really help anyone here / is there any fixes that I haven't seen to this?

Also, very noob-ish question- if I do a factory reset for something like this, will a TWRP restore after negate the entire point (because it's an image, so the problem would be restored)?

Thanks a lot!