If it's mostly that sort of riding then I suggest you do what many of us here have done recently and take a course.
It will teach you how to use your bike best and really open your eyes as to just what you can get out of a 620.
Betty trust me I eat, it just seems that I use everything not much storage on my bones.
Bigfella you should come out with us sometime, have a chat and get to know different peoples opinions.
Everyone's bikes are used for different things and it seems you are an allrounder.
If it is more HP you are looking for then may I suggest you go back a few years to the old skool 900-1000
They still have the same cockpit as you have been used too but add some more ponies for a bigger
but then you are looking at
heading skyward with that front wheel.