Hopefully stuff is changing, because I've been wanting a BCM KMR for a long time, but have never been able to find one.
I'm partial to SLR hanguards now. There are a lot of options currently. I'm either going with Geisselle or Midwest Industries on my next upper.
Also, be sure to check out your Aero stuff closely. I've been reading a lot of comments about problems with their machining. I've not had a problem with any of my Aero components, but apparently boo-boos are out there.
You've probably also noticed that there are a lot of affordable muzzle devices now. Take a look at the tests from The Truth About Guns. They have a few videos on YouTube and data sheets on their website. Should help guide you to what you want. I have the cheapies, like the J-comp and the JM. And expensive stuff like the Lantac Dragon. They all work good enough. I don't know if I'll be buying the more expensive stuff anymore.