twowheeler,
Time will tell
. The scoot has a couple hundred miles since the changes and is still running.
Funny, the Eton owner's manual shows MAX HP at 8,500 RPM's that's way above your limit of 8k.
Screen shot attached of manual as jpg. Actual manual from Eton is located at
http://www.usservtec.biz/DC_OM/OM_ESPORT.pdf Page 25 has the specs.