Upgrade complete...... for now.
New components include the quad, both grips, and a cheesy red laser that I added for shits and giggles. It blocks the sight a bit, but I've been wanting to get a riser for that anyway, so now I have an excuse. I love the feel of the rifle now that I have the grips installed. Makes a big difference. And it was amazingly easy to remove the old quad once I had the right tool.
Might get a new stock at some point, too. Why not?