This should pretty much cover everything
In terms of grammar, I’m personally using Genki I but I’ve heard good things about Bunpro (which is free). Also, look into KaniWani. It’s really great for vocabulary retention especially as your progress into the higher levels.
Edit: Ha, @Rowena beat me by a minute