I would guess you want gjallarhorn back too. I think it's great to have to switch to special/heavy for shield. It makes diverse gunplay rewarding. Not just rolling through everything on easy mode with one gun(FB/VoC).