I agree with every thing you stated. I comment about how there is no way a causal fan can enjoy watching an event when most of the first hour was watching blood clean up and challenges. Let alone when there actually was "action" it was very limited on the action "scoring" part.
I originally thought of the freestyle if you lose a challenge you give up a point, but that may be too harsh. I would consider lose a challenge your opponent gets choice of position the same as after an injury timeout.