Make a Bike shop Visit, still not seeing enough ..

I'd upgrade the grip shifter to be shifting a Rohloff Hub, in the back wheel.

if you want Upgrades Make it a big one and not incremental.