Thanks for the efforts, a mail group is a good starting point. Wish I had time to do more website stuff too.
The main bilge is clean and gets no more than a few drops in heavy rain and the icebox drainage. I hand pump it and soap it out regularly. I did notice a tiny bit or water in the cockpit lockers last weekend though. The engine sump was really nasty when I bought it, I've scraped and cleaned and scraped and cleaned, but it could still be contributing.
The water tank has been replaced very recently. Perhaps it had a similar problem as yours! It seems very accessible.
I took a quick look this weekend and the waste tank does not appear to be easy to get at. Has anyone re-done their head/hoses/tank on this model?