The idea of anakin spending more time on Mustafar before Padme arrives is a great one, Sounds fairly complex but something along these lines would make things a bit more interesting I think.
Remember that Palps sent the separatists to mustafar so whatever transpires there would be according to his bidding, even if Ani were to find something left for him....