I've had my M&P15 stock with the exception of adding an Aimpoint CompML3. Today, I upgraded the furniture with a B5 stock, Magpul MOE handguard, Magpul MOE K2 grip and a Giessele charging handle. I have a flip down rear sight and A2 front sight. I also have a 2 point sling. I am thinking a light may be next. I have basic metal magazines. Should i consider Magpul magazines? Other upgrades?