I did notice that the subweapons and buster were changed to enhance the melee combat, but doom's level design doesn't really compliment that so it can get pretty difficult to deal with certain enemies when they keep distance, so i get how difficult it is to make Blaz be focused on melee when the game is doesn't help. Also maybe the hammer could have a different effect on melee, like deal slightly more damage and do the aoe damage on the melee hit instead of doing the animation twice.
Anyway, i hope you're doing good and good luck on working on this,.