Well... you're pretty much just making a suggestion to fix a bug. But okay, I agree, give him a high-tier weapon so that he might actually kill you before guards (I suggest plasma rifle) and that will hopefully end his hostility, even if only a temporary fix.