Hi

Sounds like you're having a ball and it reminds me of how I started about 37 years ago. Don't forget to carry at least a spare tube, patches, pump or C02 (that you've practiced using before you need it) and a little water for the motor .

Take your time with the bike upgrade decision. You might change your mind about what you want three or four times for settling on something just right for your needs. Lots of different bikes out there to choose from once you start looking into it.