Take your BCG and upper to BP Tactical. He can check the headspace and stake your gas key properly.