It's not going against Oda's vision as doesn't make sense on RS getting damage when he might use it later and doesn't make sense Usopp and Franky to modify something broken. It was fine especially later on Sanji use it later to peak at bathhouse.
Also no he didn't. Sanji overpowered him and beat him. What you mean by all of this?
Also no he didn't. Sanji overpowered him and beat him. What you mean by all of this?