I believe your issue can be dealt with by throwing the right molecules in the recommended dosage at your brain. E.g. a nootropic/antidepressant like Tianeptine, which increases drive/motivation and focus/concentration, while at the same time reducing stress. Then you're more likely to make your place less messy. Though while the effects start immediately, it will take a while until your brain adapts to the new conditions.
_________________
Asperger syndrome (diagnosed), schizoid personality disorder (self-diagnosed), dysthymia (diagnosed)