That sounds promising about the new space, Scarlet. Dr. T's soon-to-be-old office has two walls of windows, which is nice (R's did, too). His new one will just have one.
It's interesting you mention how the current space is reminding you of ruptures you had. When I told Dr. T, earlier on about the move, that his current office is like a safe space to me, he said, "Well, it wasn't always safe." Referencing the ruptures there. We did work through them, but he was right, that it had times where it felt very unsafe. So maybe the new office can be a fresh start for you and L, Scarlet?
Also, wasn't she just redoing her current office? Just confused as to why she would do that and is now moving, unless she just learned about the 2-year thing, with a possible sale. I hope, whatever you choose, it works out for you.