Well done ejchase on your continual accomplishments!
I have been working on my room. One mindset shift that's helped me recently is thinking of what I'm doing as organization vs. cleaning. I always used to tell myself I need to clean, whereas I realize now that what I'm doing is organizing. It's not dirty in here, it's disorganized.
My sister told me about a cool website with a quiz about organizational styles: https://clutterbug.me/what-clutterbug-are-you-test . I'm a butterfly :)