I totally agree. Besides, if he had repeated the Chaplin freeskate I might have felt a little bit differently, but have nothing against it as a sp....
This! In all honesty I would have preferred a revamped version of Javi's I Love Paris / Petit Fleur program, but I understand that his Chaplin is far better known among the general audience. So the idea of bringing back an old program with different music cut and new and improved choreography to show how far he has come since those days does probably work best with Chaplin. But they made a good decision to do it as a SP this time, and not another FS. A SP will require a different approach and dynamic.