X21 owners, I need a little help....

My X21 leaks at the back corners of the gunnels, on both sides. It happens when I step on the gas to go; the transom sits down in the water and before it gets up on plane, the water sprays off the undersides of the back ends of the gunnels. This forces the water inside the boat (bilge).
(No water gets into the boat if I'm just using the trolling motor, it's only when I take off with the big motor, so I know the hull is not leaking.)

I can fix it, temporarily, by caulking the end caps with silicone sealant, but I all have to do is not pay attention once while fishing docks, and drag the back corner on a dock and "Pop" goes the seal. I have also pulled the back 6 feet of the rub rail off and caulked the screws under the rub rails and the last 10 feet of the seam where the hull meets the gunnels.

I've been thinking of fabricating a shield to cover the end caps so the water flows over it instead of catching on it, and was wondering if anyone has already done this. I'd appreciate any insight that you can offer.

Has anyone else solved this problem in another way, and how did you do it?

Thanks for your help, in advance!