I’m glad you’re re-instating a shortened Diner scene. If nothing else, I do like how it adds a bit of characterization to Obi-Wan, portraying him as someone with relationships and connections outside the Jedi Temple. In A New Hope, Obi-Wan seems to know his way around Mos Eisley cantina, and has no trouble finding the right person to take the crew to Aldeeran. The Diner scene shows a little bit of that side of Obi-Wan, whereas much of the prequels portray him as stuffy and bookish.
As for the garage scene, I think l8wrtr’s edit shows that it can be salvaged, but I honestly prefer Hal’s decision to excise the scene entirely. It’s better that Anakin carries that tension inwardly and shares it only with Palpatine. I think it would be very difficult to cut the scene in the way you’re suggesting, but I’d of course love to see any attempts you might make.