I was thinking about your question this morning, and honestly I would keep the plan simple so it stays easy to maintain.
If the room still feels crowded after moving the shelf, I would remove one larger item first instead of reorganizing everything at once.
That usually shows whether the problem is placement or just having too many things in one area.
I also like labeling one drawer for the things I use most, because it keeps me from making little piles on the table again.
If you want, I can stop by this weekend and help sort the stack near the door, since that seems like the part that causes the most frustration.
I have found that spending even twenty minutes on one section is enough to make the whole place feel calmer, and then it is easier to decide what should stay where afterward.

I meant to reply earlier, but I wanted to try the idea myself before saying whether it actually worked.
After moving my afternoon walk a little later, I noticed I felt much less distracted for the rest of the evening.
It was easier to finish the small tasks I kept putting off, especially the ones that needed a clear head rather than energy.
I think the biggest difference came from keeping the routine short and predictable instead of turning it into a whole event.
Even making tea right before sitting down helped signal that I was done switching between too many things at once.
If you are still experimenting, I would only change one part at a time for a few days and leave the rest alone.
That way you can tell what made the difference and what just happened to line up with a better day.