Though tbf, I'm not sure any competition with an artistic element belongs in the Olympics. I would ditch stuff like figure skating and synchronized swimming. Gymnastics can stay, but I'd prefer it be more standardized.
All the sports you mention have had most of the artistic elements beaten out of them by standardised scoring systems. No one wins olympic gold in figure skating or synchronised swimming by being artistic, they do it by repeatedly and perfectly executing the highest scoring techniques as defined in the rule book.
How familiar are you with gymnastics scoring? It's quite rigid. The ongoing controversy is not really related to the objectiveness of judging, but an administrative error (assuming the IOC is truly in the wrong here).
Though tbf, I'm not sure any competition with an artistic element belongs in the Olympics. I would ditch stuff like figure skating and synchronized swimming. Gymnastics can stay, but I'd prefer it be more standardized.