I’m having the same problem with the stumbling past 6-7k rpm with the aftermarket cap. The problem stops with a full tank of gas. Removing the cap doesn’t help. Maybe I got some bad gas or water so I’m going to try an additive. If that doesn’t solve the problem then it’s got to be the pump or filter.