I second the use of BunPro.
Here are some threads that may be worth your time:
https://community.wanikani.com/t/is-genki-my-best-choice-for-grammar-study/14957
https://community.wanikani.com/t/wanikani-and-genki-1/11958