Buy a low profile gas block and a free float forend and then swap them out.
I'm not sure I would bother with the "upgrade" though. It looks nicer an gives you some more mounting options but I don't know it it's really worth spending $200+ just so you can hang stuff you don't need off the front of your rifle and making it heavier. People are going to tell you that your rifle will be more accurate and they're right, it will be a tiny bit more accurate, $200-$300 more accurate I'm not sure. I've had non free floated AR's shoot sub moa groups and I've had free floated AR's that would not so to me it's more about barrel quality than just free floating the handgaurd. It's definitely not going to turn a 3 moa rifle into a 1 moa rifle so don't do it expecting a huge improvement in accuracy.
Whatever you do though, don't buy a quadrail forend, you will want something in M-Lok or keymod so you can keep the weight down and still be able to put a rail section or accessory wherever you want.
Depending on how much work you want to do you may want to stick to a forend that uses the original barrel nut rather than having to buy a barrel wrench and a reaction rod so you can swap that out. Some forends use the stock one and others have their own proprietary barrel nut.