I like your COMP 2094/1512 as a pitstop, then retrace down to gap (maybe even fill it/partial?). Having said, better wait to make sure this sticks first (which it should).