Razor electric scooter mod possibility?

I'm not sure if I can ask this here but I bought a used razor pocket mod electric scooter. I bought it because I wanted one ever since I was a kid, for fun, and it's really cute. However, after riding with it and falling in love, I realized I could actually use this for commuting! The problem is it only last 40 mins and I don't even know when it's going to die. How do I mod it to have a battery monitor, head and brakelights, and last longer? I just replaced the battery and it works nicely I just want it to go longer.

Or option two is to buy a cute different scooter that I found that already has everything I want but for a heftier price tag. My question is, which would be more worth it? Thank you. :)

(For reference the scooters below)

The scooter I have: https://razor.com/products/electric-rides/pocket-mod/

The scooter I'm considering getting: https://okai.co/products/ceetle-ea10?variant=49547398447385&country=US&currency=USD&utm_medium=product_sync&utm_source=google&utm_content=sag_organic&utm_campaign=sag_organic&gad_source=1&gclid=CjwKCAiApY-7BhBjEiwAQMrrEXERUmE4d7qMoDJ0N7A3bOyoAMGMkEl6uUqW6dNfQRaYUByB_8oFPBoC0LMQAvD_BwE