Dilemma that came with Unifi Mobile

After using the Unifi Mobile for a while, I am facing some issue. Havn't had a solution yet.
My previous testing phone, Samsung Galaxy J7 Prime has band 5, 38, 40 which fulfill the need of Unifi mobile but the phone lack of Compass and Gyroscope which force me to purchase Asus phone. Then, when I switch the Unifi Mobile to my Asus phone, I notice that the phone actually didn't have band 38 which is insane. My working place is covered with band 5, 38 only. So now with my most hours spending place unable to receive high speed LTE. I plan to switch back the Unifi mobile back to J7 Prime but unfortunately the phone die out that day and I have to send it back for the last minute warranty claim which will expired in 3 weeks after 3 years of purchases.

Now the situation is I have insists on not repairing the phone but opt for replacing the phone with another unit. Should they unable to provide another unit, I will be given store credit to purchase equal value device. Nothing confirm yet.

The support called me to advice me to opt for repair as replacing it will void my remaining warranty which I don't think 3 weeks left time is a factor that I need to consider.

With the might be store credit, I need to decide which device I should purchase. My current situation have 3 options, purchase another new phone which might not compatible with coming soon 5G that the current government is pushing really hard to launch by the mid of this year.

Another is purchase a 10.2 android tablet that will overlap with my iPad 4 usage. The size also not so travel friendly. The last option is purchase a 8" android tablet that have s-pen support and travel friendly but not so nice for media consumption.

Nothing is decided yet but there are too many constraints for each decision.