Have you tried using Bunpro together with Genki? They have the grammar points distributed by JLPT levels and they mention where each point is in Genki. The cool thing about Bunpro is that they have a SRS (just like WK) but for grammar This is definitely a game changer in terms of knowing where your weaknesses are.
This is definitely a game changer in terms of knowing where your weaknesses are.