The re-done foam looks a lot better.
I don't know how much good that drainway is going to do on the side, but it sounds good in theory. I prefer a drainway down the center/keel of the bilge with a deck drain installed through the decking. This gives water more room to accumulate should you get a lot of water on the deck quickly and it lines the water up with the bilge drain plug for a direct route out of the boat to get rid of it quickly. The water in the bilge over the keel will also act as ballast and keep your boat in an upright position in an emergency instead of rolling over when the water on deck rolls to one side.
You can go ahead and keep pouring your foam solid and then come back and cut and dig out the foam for the keel bilge drain.
My boat was designed with the keel bilge drain and it worked really well whenever I got caught in a monsoon type flash flood rain:
... and you can see the deck drain here:
Water off the deck and into the bilge to be either pumped out by the bilge pump or drained when the bilge plug is pulled.