I am not familiar with M&A kits so I don't know if this would work, but I would look at either the free float tube with the weaver rails, or the handguard with weaver rails.

They also have ergo grips, I don't have one but others seem to like them. They also have nightsights, which might be cool.

There is a spotting scope for sale for $ 170. I don't know what kind, but a spotting scope is certainly a necessity.