i dont know why you are trying to get rid of the fuel pump. Keep it, its NOT overkill. YOu can tune with it fine.

i would NOT tune it then replace it as it needs to be retuned "checked" again