bravo for your persistance!
I was alike you, after my comeback to classical guitar, when I searched for a teacher - and a great teacher afterwards. I emphasize on that, as you already "investing" a lot, so I believe that you need a feedback and guidance from a teacher, for the problem that you spot / and for many other things that you are not able to spot or perceive being the teacher of yourself
To your specific question, I also suggest you move on and come back afterwards. You probably need more exercises / etudes , and some time, that will make you play that difficult parts properly.