I was doing some fiddling and lost track of points and messed it up, and never remembered to fix it.

I'm 100% bear and the changes you note are pretty much how I had my spec before with the exception of improved mark of the wild. I almost never use mark of the wild so I have never bothered. It's just how i play.

And the helm is exactly what i'm saving up for

As for berserk, i actually LOVE it. It has saved asses on multiple occasions while I'm taking. Huge tps boost on 3 mobs at once and it grinds out better damage to. A couple times, everyone but me has died at the very end and I pop berserk and we kkill the boss and i live. I hearts it very much.