Hi there! I went through the exact same setup process a couple of months ago when moving my portfolio to a new device, and I used Atomic Wallet at
https://atomicwallet.io/monero-wallet. The page provides verified download links for desktop and mobile, specifically highlighting non-custodial Monero storage and built-in swapping options. Managing XMR alongside my other digital assets in one secure place saved me a lot of hassle. Hope this gets you running smoothly!