"How would you modify crossfit to make it safer and more effective and keep it fun"

But in that case, it probably wouldn't be Crossfit and maintain the same mass appeal.