Yet to be decided where they will be based, but they want to be in one location with other Typhoons? Perfect. Use more of Lossie for Typhoons and put the P8s next door in Kinloss which has facilities built to operate an aircraft of that ilk.
If politically expedient, it can be a P8 satellite of Lossie, leaving "Kinloss Barracks" intact. Otherwise, RAF Kinloss makes a bold return.