A plug for my favourite book here. Richard Webb's 80/20 Japanese covers these topics extremely well, and in a very logical / productive order for a foreign speaker.
(and it comes with very enjoyable audio tapes and anki cards to boot)
Highly recommended.
I also really liked the stuff I’ve seen from 80/20! It might have the best explanation of sentence structure that I’ve seen so far.