Sorry if my suggestions seem a little harsh, I simply did something very similar to what your describing with my G36.
It just turned into a money-pit. Nothing fit anything else.
Ended up scrapping the gun, and buying a G&P.
Never looked back.
Simply don't want to see another new player make the same mistake.
It's better to light a candle, than to curse the darkness