thats one ''classic'' bushy !!!
if it was me... i'ed leave her [as is] .
shes an A2 , and she's already set up perfect for a IDF clone' or a SHTF , K.S.S. rifle.
only thing i might do is add a BCM M16AUTO carrier'and a H2 buffer,
slow down the carbean action a wee bits, and shoot good ammo, and LOTS of it.
till ya gets your other one fixed, just my ''opinion''
p.s. i build a dissy just like yours [IDF] clone with an A1 carry handle' ''love it''
but saying that, i still thinks a ''rifle'' is the way to go, a 20'' M16A1.
as eugene stoner ment the AR to be. [perfection]