Been a while since I decompiled an APK.
Instead of using dex2jar/d2j-dex2jar and jd-gui I came across jadx.
What caused me to try jadx was a problem I had viewing some classes in jd-gui showing as
// INTERNAL ERROR //
and jadx solved the problem.
Update: Running jadx-gui on OSX High Sierra and process utilization burns CPU during decompiliation and doesn’t pass 91%.
Will try to investigate the issue.