I would change the rear sprocket to a 33 for quicker acceleration. You may need to lose a link or 2 off the chain.
A 31 rear may be too tall to wind out the rpm's enough in 4th gear. A hot cam or race cdi ''worthless'' IMO, won't help a bike that's over geared.