Start on NXT but then continue on Raw/205Live/CW Division. Have a blood feud in NXT through Brooklyn but don't have the blow off happen at Take Over, have Ciampa win underhandedly or cheaply via roll up or something so fans and Gargano don't get their complete revenge. Then have Ciampa called up/signed to 205 Live based off this win, so Gargano unable to continue the feud for a spell.
This time separated would give Gargano time to focus on NXT title with the idea that it is a pathway to the main roster and his path back to getting his hands on Ciampa.