I would definitely do the Fuel pump, the standard one is not brilliant,
Drop Richard a line at FB Tuning and tell him Dave said you would look after me
Also bhp numbers are not too important, it should drive and feel quicker and smoother on the road.