Is the cam original, or is it a letter cam? It sounds like your problem is too much cam and not enough gear. Which means that you have to keep the revs higher than you normally would, to keep it from bucking.
A quick fix is driving around in a shorter gear than you used to drive in. Or get...