Have you gotten a Japanese tutor or thought about that at any point?
I said I before wouldn't but I ended up doing it anyway. I've been doing italki for 6 months by now. It's helped me feel so much more confident, even though most of the work is still immersion ofc