It's doable but it's still not desirable to me.

My ideal set up would be to remove Yoda from the PT and only have him mentioned with awe (thus preserving the surprise in ESB).

But if he is kept I'd cut every use of a blade and rework the material so he uses the Force alone.

I could almost be tempted to allow Palpatine his saber (the Death Stars are basically giant Sith lightsabers).

It diminishes his dignity a bit seeing him fight like that but I guess seeing as only the Mace fight would remain and he is setting the guy (and Anakin) up for a fall it could remain but adjusted as seen in a few recent attempts to not be farcical.