Your pretty much on top of it now then, might be worth a full self service if you havent already. obviously your half way there lol. FPR sorted, fuel filter, etc. Should come up sweet

Whats the milage like?