Manatee upper deck does not drain

Hi all
Back to the well. two questions about water on the upper deck
1. Water pools along the toe rail on both sides of the deck between the openings. How have other Manatee owners dealt with this?
2. When water runs off through the openings it makes a meets on the side of the boat and the cap rail below. Any ideas on how to make/install a gargoyle to move the water farther outboard?

Thanks

Spoke with the boat yard today and they suggested a 1/2-3/4 inch pipe through the toe rail at the low point.
Also, with regards to the water dripping on the cap rail - the boat yard's suggestion was to router a "Drip edge a 1/4 inch back from the edge on the under side of the upper trim piece. I am planning on doing both of these projects (I'm letting the yard do the fiberglass work, just in case the screw it up... the routing im planning on using the router attachment for my dremeil tool.

Has anyone else done either of these fixes?

Paul