Is there maybe a viable order where the elevator scene comes before the training, which comes before the meeting with Padmé? So in the elevator they’re talking about the forthcoming meeting, but they have training first?
That way it could almost play out that Obi-Wan has deliberately scheduled some training to get Anakin out of awkward teenager mode and clear his head.
This might not work, I’m just spitballing!