Yes, I have the original handguards. The round things on there now are an old set from Lone Star Ordinance, circa 1986. You cannot use a Harris Bipod with the original guards, and even though I have an original USGI clamp on bipod, I do not like the marks it makes on the barrel. So, for bipod shooting, I use those handguards. Same with the windage knob, I still have the original parts in my safe, as well as the original round front sight post, but I much prefer the square one on there now.
I guess, in the end, if I cannot get a close enough match, I am going to have to build an A1 and A2 Clone, instead of the A1 upper. Oh well. A few years ago, I did see an R6001 in Coltguard. It did not roll out of the factory that way, but the original owner had it sent back to Colt to have it done. That really caught my eye and now I need more than just one.