Well you do as you want, but I will keep my coins in my phone until the forkathon is over and then make a bunch of paper wallets for half my stash and move the other half to another Coinomi wallet. I will then use the seed from Coinomi to extract my private keys and claim all the coins that I couldn't claim in Coinomi using Bither and Bitpie instead.
Coinomi is non custodial if that makes you feel any better.
Personally I don't see how a wallet on your computer is any safer than a wallet on your phone (maybe except for a full node on an ofline computer).
It should be noted that the phone I use for crypto is only used for that and only gets started when I need to do something with my stash. On my everyday phone I have very little crypto.