One of the things I repeated a couple of times during the recent WWDC was that in my opinion you should prepare your environments to receive monthly releases of the GBC and be in a position to switch quickly between GBC releases.
This will allow you to compare your customisation against the standard GBC, and also to compare different GBC versions.
Read more at
https://4js.com/ask-reuben/ig-260/