Share 'upcoming trip to Zurich/suggestions for chocolate-related places to visit'

Hi,   I have an upcoming trip to Zurich and have been looking into chocolate-related places to visit.  It appears that the Lindt factory chocolate tour is closed so I am looking for other suggestions.  Are there any other manufacturers in that area (or a train ride away) that are interesting to visit?  Any special chocolate shops that stand out above the rest of the crowd?  I'm also open to heari…