Once again I have no idea how it could be done but you could have Padme and Anakin declare their love and even get married before Geonosis.

Anakin could decide to tell the council and resign but then the war breaks out and he feels obliged to keep their marriage a secret for more noble reasons than just remaining in the order, he has to remain a Jedi to protect the Republic.

It would mean losing Threepio at the wedding and restoring Anakin's real arm and adjusting the lines before the arena scene a little.

Perhaps the line about not caring if anyone knows they are married from ROTS could be inserted into their stay on Naboo which could be a Honeymoon.