I am willing to wait. If you want a Grace One Pro today, you could gamble on replacing the motor in a year. There is a 1 horsepower difference. So, you might not be able to upgrade. The axle may not be wide enough.
Notice the One.15 does not have a gear cassette. I doubt an 11 gear cassette would fit with disc brakes and a giant motor!
I think you would be ok with the One Pro. The advantage is the One Pro is still a moped.
The One.15 is Legally considered a motorcycle in CA. It also has a gearbox designed by Porsche engineers, rather than bicycle derailleur. The frame bottom bracket is square for a gearbox, not a chainring. the drivetrain uses a carbon belt, not a metal chain.
The One.15 just ain't no bicycle, although the visible difference is very subtle.