I had the same washer tank leakage about 2 months ago and had the pump replaced. I was surprised how easy it was. It's so much easier fixing the little things myself. The dealers are too indulgent and it gets annoying.
I do really want to get the bottom of this issue too. Currently I just leave the Auto Lights and Rain Sensor off until I need it.