While Given, When, Then works better than PBT for new features (Arrange Act Assert), it does not do as well for refactoring, so look at implementing a hybrid system of both Gherkin and PBT (possibly EARS?) for refactoring scenarios to ensure good coverage.