I bought a mushroom snorkel top for my D2 from England which is for the Defender. I have made one complete snorkel so it is not anything that you can just buy. The mushroom keeps water out and lets a bunch of air in through the bottom.

Water proofing everything that has electricity running through it is a good idea, use some dielectric as much as you can.

Have fun.