qpalqpal:
From your posts I assume we are about the same level in terms of what we can effectively study. I also want to learn proper technique to be able play music I like fluently and I don't think it's possible without gradually developing your skills through easier pieces. I hope you get a proper classical teacher too one day. It might be quite a shock though, if you have developed a "different" (don't want to say bad) technique. Some people will disagree and just learn the complete works of Chopin and Scriabin when they start on the piano, but there are quite a few examples in YT how romantic music can be butchered...
I also studied the Clementi 36-1 and I think you should finish it. I don't really like this type of music, so I didn't have the stamina to memorize it, but I still use the 3rd movement as warm up since it was easy to memorize. It is the easiest of the 3 movements IMO, even though faster there's a lot of repetition.
I wish I could like Bach because it seems to be the way to learn good technique. But I just can't, I find it extremely boring

So I play Scarlatti instead, which I love. You shoud start exploring the easier sonatas, check out the Pianostreet files, there are lost of them in grade 5.
Some other pieces I am going to work on with my teacher this Autumn:
Chopin prelude nr4 (I already learned the notes last year, so it's not difficult, but now I want to learn it better)
Chopin waltz A minor (post.) (I really need to work on chord leaps)
Satie Gymnopedia nr3 (more work on chords)
Some short pieces by César Franck
Diabelli sonatina in F (I really hate the piece but I am not ready to give up yet. Probably will never get past the 1st movement.)
So my advice is to forget the Chopin Etudes for now and learn pieces that are graded 5-6 (and even easier ones that you like, that will help your sight reading).