IMO, that's not procrastination. That's just guilt-free play. The key is that you are still getting things done that you need/want to do. You're just aware of when you need a break and are comfortable letting yourself do so. That's not the procrastination that the OP is talking about...
You have a very valid point, and even though I call it procrastinating it's not the same. However, I am all too familiar with the procrastinating of the type described by the OP, as I have experienced it myself quite severely.
I suppose the reason I made my comment is one day I realized that it was actually a positive thing to "procrastinate" for a non-trivial amount of time before I even start working; as long as I actually do start before it gets out of control.
I suppose it was also helpful for me to get rid of the psychological baggage of feeling guilty about "procrastinating", and I wanted to give a word of caution about not over-compensating by going to an extreme of never taking a break, or taking too short of a break, because of feeling guilty or afraid of not being able to start working again if you do.
I do this and call it "constructive procrastination". I quite often wash the dishes because I'm putting off writing some code, for example.
In your specific case I think it's even healthier. I can't work well or think straight if my environment is cluttered, it feels like it's cluttering my head as well. Identifying things in your environment that affect your performance and taking control over them is KEY to productivity and happiness.
Thats awesome. I'm reading the Now Habit at the moment (mentioned by the OP) and that seems to be one of the main points. "Guilt-free play" is about doing the things you WANT to do when you want to do them, so you can focus on important stuff later. Guilt is a huge part...