The 6400C is really about as close to the Military M4 you can get in the civilian market and is chambered for the 5.56mm and the barrel's 1:7 twist will handle just about any ammo weight you'd throw at it. I have been really happy with Colt lately - their fit, finish and function has been flawless on all the rifles I've sold over the past year or so. The reason Colt advertises the rifle as a .223 is because it's a commercial rifle, so they advertise it using the commercial ammo caliber. As you pointed out, the fire control group pins are still Colt only, but there are still trigger upgrades available.
The Bushmasters are both fine rifles as well - however, I would strongly advise firing a rifle with the stubby stock before firing one. I have found the stubby to be much too short for firing comfortably. I've noticed a slip in Bushy's QC lately, but nothing that has really alarmed me much.
You're approaching this very well. After all, you've already admitted to yourself that after you buy one - you'll be buying another.
In closing, I personally prefer the Colt, but any of the above rifles would serve you quite well.