The click could be a pedal bearing. Bottom brackets tend to clunk more than click.
Most clipless pedals now have unmaintainable cartridge bearings. Just the same, you can remove the spindle and bearing, load it up with grease, and reassemble, torquing down the retainer nut really hard. Worked for me.