Isaac, I was in your shoes a couple months ago and probably still don't know as much as has been dispensed here now but..ended up with a RRA Predator Pursuit with a 20" barrel, match trigger. Shot it for the first time the other day with some Black Hills 52-gr HP and it shot sub-MOA. My focus is on coyotes in the winter and not two-legged invaders but it probably would deter them anyway.
Sounds like you hit on a good arrangement and will be fixed up shortly.
