I just had the same thing and took it to the LBS - turns out I washed all the grease out from the BB going through the 3 ft deep creeks during the winter...

They put some more on there, but I went riding today (no creeks) and it started up again worse than before at the end of the ride. Wonder if I'll need a new one?