OK great now I understand.
I wanted to at least upgrade the handguard so I could add a vertical hand grip and that is probably as far as I will go for now. I will just work on shooting, shighting it in and making sure it is reliable. I do have quite a few gunsmith in my area. But like you said I need to find one that is good and know the AR.
The Magpul handguard is an upgrade from what you have and you can easily attach a grip to it using a magpul m-lok grip. You can also add rails for a light or a sling attachment.
The Magpul handguard is a straight drop in part and requires no smithing or removal of parts sans the old handguard. I had one on a 16" DPMS HBAR upper and it worked well for what it was. If you're not really going to shoot past 100yds don't worry too much about free floated handguards. If you really want one it would have been better to have bought a rifle with one already installed.