There’s no way around this one; it’s a plot hole created by the prequels. I think what happened is that Lucas started running out of time at the end of RotS and had to cram everything in so that it was all in place for the next film, Star Wars. If he had written the prequels with a little more attention to detail and better planning he could have avoided this dilemma altogether.
You’re right.