I think the idea of a dark saber or beskar staff (any sort of Lore accurate melee really) would be a good step in the right direction, realistically the Imps only other melee is loosely the SBD. I don't mean to hijack your thread but I've put some thought into reasonable changes to Mandalorians...