I got back to piano a year ago as a middle age adult. I was intermediate level maybe at that time, not quite as good as you are now on piano. Never had discipline when I took lessons before, eg didn't count much, sloppy about holding notes for full value or observing rests etc. I got a good teacher and as you surmise about yourself, I had so many other problems! So I suggedt you put some effort into finding a good teacher. Mine has a masters in piano pedagogy or whatever that degree is called, and I swear, if I have a problem of any sort, she almost always has some way to help me with it. All the best in your piano study!!