Have AOTC be episode I (reworked a bit so it has elements of TPM). ROTS/episode III stay the same minus the opening rescue of Palpatine. Episode II would then just be the Battle of Coruscant extended to a full movie.
That way, no need to have a ‘2.5’ episode, it is still a trilogy, and we get to have a full movie of Obi/Anakin working together that also works as a full Clone Wars movie.
Don’t know how to have Padmé part of that storyline though. Maybe we get some back and forth between the battle above Coruscant and Padmé doing political stuff on Coruscant. Or just have her be with Anakin and Obi-Wan on the rescue mission and have them work as a trio like Luke-Han-Leia.