On the weekends, DO NOT GIVE A BOTTLE. We used to only do bottles at the babysitter's. When I was off, baby went everywhere I went, and I nursed.
The other thing....if you have any time off, take it, go to bed and take a nursing vacation to "reset the system," so to speak.
Clicking also makes me think of a tongue tie. And even a cleft palate (submucosal in your case, which can't be seen on casual observation). My fourth baby had a weird click, and that's one thing that clued me in that there was something wrong.