Before replacing bottom bracket, I'd try replacing chain. A bad chain will give you the same bad clicks and bad feeling in the cranks/bottom bracket.
If it is the bottom bracket Fwiw, in My experience the loose ball bearings spin smother with less resistance. Provided your bb cups are not ruined I'd just replace the ball bearings. However a sealed BB is easy peasy to install. Good luck.