Pretty sure we've already done this, and the outcome was that we're still using both those words, which I'm personally fine with tbh. You have to draw a line somewhere.
That said, if you're not comfortable with using them "clown/clownish" is a good substitute as no one was ever born a clown.