I believe this is all intentional to
A SLow down progress
and
B get us to pay gems to reset HR

And up to now I haven't had MAJOR issues getting my drops
but I would think that making the final 2 bosses that drop cloak and/or relic should not have sword/staff plans. Once you get to Guard plans those bosses are insanely difficult to beat in their own right, and spending time after time hoping you get the right combo of stuns/crits/dodges etc to win slows down progress enough IMO.