If you have the tools to do it (or you can get the tools to do it pretty cheap). I just had what looks to be the same issue. I just removed my cranks and cartridge bottom bracket, and greased all the threads and put it back together. I no longer have this clicking. Im not sure if I just got lucky, or if this is a common thing to happen. So for ~$20 in tools, I got it fixed for less than the LBS would charge for a new BB if thats what they would have changed.

Also, if you do decide to get the tools, pay the extra $2 for the Park crank puller, dont get the Nashbar one and have it brake on you like I did... I didnt notice the prices were so similar, or I would have gotten the park the first time!