Leak

I finally found the source of water getting into the hull of my Epic V10Sport. Not a ton, but not water tight. 1) one of the steering cable tubes is not totally intact at the rudder. There is a small ring of dried epoxy around the line that broke off of the entry hole into the hull. This would be ok, but 2) while the screw-on cap to the steering yoke compartment is water tight, the round plastic part the cap screws into is not water tight, not fully sealed to the ski. Water goes under the apron, into the rudder yoke well, and into the hull where tube is loose. I would not think much water would slosh over the top rear of the ski on relatively flat water, but I guess it does.
Should I 1) caulk around the outer circle plastic piece, 2) disassemble the cap assembly and reseat it with caulk, or 3) get a new cap assembly?
Thanks