N910T with 5.1.1 vs N910T3, GPS performance?

like many others my GPS is just awful on my note 4. Do I have any hopes of it being fixed with 5.1.1 on my SM-N910T or should I just try getting the SM-N910T3 as a warranty replacement?