That would be a major step up, Dan. As long as you are considering this kind of change, take a look at the new CFMoto 450MT. Not that much more money, but much more performance. Yes, it's another China bike. Could be made of unobtainium for a while though.
https://www.cfmotousa.com/motorcycles