The only other solution I can think of with that order is to try to crib Padme saying “yesterday” from her scene with Obi-Wan so she says “he came by yesterday”, but I’m not sure how seamless that would be in practice. Hal is probably fine leaving the scene out of his edit, due to his not wanting to include the second dream sequence (Personally I would just include it, but Hal has certain goals in mind with his edit)
I believe I tried that and it didn’t work to my liking.