It's from somewhere in there. I was more of reggae fan but I had a lot of friends who were 3rd wave fans, and played in a few ska bands.
Nailed it with those changes. The drums feels much less aggressive which seems to open up the rhythm. And 'step off' sits better now. Well done.