I got the same engine with similar issues
cannot exceed 4200 RPM when engaged ,In neutral RPM can get up to 6000 RPM,
I did replace my fuel pump kit few months ago and the hose from the fuel pump to the filter with regular fuel line without any bend on it as the original , I think this created a fuel restriction , replaced the fuel line with original and testing schedule this week end
Did you test this weekend?

