Intermediate-level resources?

What textbooks are the best to learn Brazilian Portuguese? I’d say I’m about B1-ish but I could probably do some good revising the basics.

I’m looking at either the “Routledge Brazilian Portuguese Grammar and Workbook” by John Whitlam [God rest his soul] or “Gramática Ativa 1 and 2” for grammar review (grammar is a weak point of mine), but I don’t know what else for an actual coursebook.

Some I’ve seen are “Ponto de Encontro”, “Teach Yourself Complete Brazilian Portuguese”, “Pois Não”, “Tudo Bem? Vamos Aprender Português 1 and 2”…

If there’s any graded readers or books to recommend? Let me know. (For context, I’m a huge nonfiction guy.)