Returning Player - Merit Points?

Just came back to the game a few weeks ago and burned all jobs to 99. Curious to know if merits have changed on Warrior with all the new content or are all the old endgame merits still good. What do you have as your current merits for delve and WKR Warrior?

max hp 15/15

str 15/15
dex 15/15

Great Axe Skill 8/8
Criticial Hit Rate 5/5

Savagery 5/5 (important in my opinion)
Tomahawk 1/5 ( nice to have sometimes but not important)
Warrior's Charge 4/5 ( hardly ever use it cause ja time = decrse dps but nothing else to use merrits on)
Double Attack Rate 5/5 ( passive dmg boost is always grat)

Warcry Recast 5/5 ( i did this for pt boosting you might wanna go with berserk instead)

5/5 Savagery
4/5 Tomahawk (Can 5/5 instead of 1 WC)
1/5 Warrior's Charge
5/5 Berserk recast
5/5 Double Attack