Looking for an alternative e-scooter store in NYC

I only recently found out that Fluidfreerides and their parent company filed for bankruptcy via random YouTube algorithm. I've been using their FFR Horizon since April 2021 and had over 7900 miles on it. Part of the reason why it lasted so long was because I normally use their store to service my e-scooter annually and to replace the rear tire once it starts to go bald. But with the possibility that the store might be closing, I decided it might be time to look for alternatives.

I am looking for a store that sells commuters with similar specs to the Horizon, especially in regards to the e-scooter weight, not max load weight and offers on-site repair services. I don't mind spending $1,500 or more if the quality is good and the battery is trustworthy. I think UL2272 was the standard now.