The clunk issue is largely a matter of the Fist stances and how irrelevant they are outside of Riddles.

Removing Fist Stances alone would remove much of the clunk as they currently serve no real purpose other than button bloat.