I had some of the same concerns with my new "20 colt barrel I got.
I got a new set of round rifle handguards from a chap here, and they did fit the triangular hand guard retainer, they were designed with tabs on the front for both types of retainers. worked out great.
I also, want to set mine up with a collapsible stock too. I dont think it will matter,should be fine.....