How to improve the language that I'm using?

I live in Montréal.

My boyfriend only speaks to me in French (he doesn't feel comfortable speaking English), I attend full-time at a French-language university here, I speak only in French with my friends (from that university). I watch almost exclusively French-language TV shows, Occupation Double, Les Traîtres, Big Brother (Québec), and a bunch of French YouTube videos (Romain Basso, TiboInShape, ARTE, Danii le Russe, Radio-Canada, 7 Jours sur Terre, Radio Télévision Suisse, etc.). I work in French here. When I go to stores, I talk to the employees in French. Basically, my whole life's in French here.

I'm completely comfortable speaking in French with ni importe qui, but I know that my grammar and vocabulary kind of sucks.

Is the solution just to review grammar and vocabulary from a textbook?