It appears you and I came to the same decision recently. I also took advantage of the BCM sale and bought a 16" lightweight upper with the new KMR rail. I have a Geissele SSA-E trigger which completely lives up to the family name. I put a Razor HD Gen-II 1-6x24 with a BOBRO mount. Don't know how much you are looking to spend but I would definitely look into the Razor. Regardless that is a nice shooter you built, Cheers!