It might be worth running some upper engine cleaner through,it will help 'smooth things out'...

The fuel filter would be the next thing i would swap.

And I recommend to check the timing is set correct.