I am seriously thinking about going for a hardware wallet. But not finalized as of yet.
There's not much to think about here. Hardware wallets are a far more secure option than your current wallet, especially if you plan on using it for long-term HODL. The sooner you make the switch, the better.
Take a look at some popular options like Trezor, BitBox02 or Passport. (These are just a few of my favorites - there are others out there.) They're user-friendly and offer top-notch security. And they're not so expensive nowadays, anyway.