Hi Xavier we are on the same boat, I' ve been working hard these times, but, sometimes it looks like it is not working.
I try to be exposed to the English language the most I can (books, aticles, tv, youtube channels) aways with subjects of my interest, it helps with the fluence, but the vocabulary is also my problem.