✿.R.
You sound just like me. When I spend the day cleaning I usually can't go to bed at night because I have so many piles on my bed. :)
I love fly lady but I didn't sign up for her emails. I heard they are overwhelming. I just watched the videos. I took one little step and ran with it. I just focused on keeping my sink shiny. I created the habit of putting the clean dishes away in the morning and putting the dirty ones in all day long. Wash at night a repeat. It's amazing how that changed my mood.
Another thing I changed which I see you doing is moving stuff around. I used to move stuff from room to room and make piles to organize. I can't say that I have completely broken this habit but I try to use the only handle it once rule. Ex. I will look at the hutch in the kitchen which is one of my hot spots. If I pick it up, I put it where it belongs rather than making a pile to put away.
It's really hard not to get side tracked but just keep saying bedroom, bedroom, bedroom....whatever room you are cleaning. I need to refocus myself all the time. It's hard to break habits. You can do it though.
Good luck.