I think that you are on the right path with the new locking shoulder installed and the bolt now closes on the go-gauge and will not close on the no-go gauge . I have seen a number of Len Savage's rewelded Bren guns with head space problems ,most all were corrected with the locking shoulder adjustments .