And who's idea was that?

No, really, not my cup of tea but it is your rifle. Set it up the way you want. Often times when the "pure" military rifles are unveiled they are a little less than perfect. It looks like some of the modifications you have done would be improvements. Let us know how she shoots. A picture of the target would be cool.