I did replace both. Runs alot better now, but I know have fuel pressure issues. After sitting a while, I have to crank a few times before it stays running. Fuel pump is running but pressure is low for the first couple of key cycles. Will be changing pump this week. Also replacing rotten fuel...