That Foam is really preety poor. I replaced mine with 1 liter water bottles (empty of course) These are impervious t gas and oil and won't act like a sponge when wet. They'll be a lot better floatation than that foam ever was.

Since you've got the floor out what about running a piece of 1 1/2" PVC pipe from front to back for a wiring conduit ?