Is the Lyons Chapter bugged?

hey all, recently been playing OWB with the new Rustbelt update and East coast reborn.

Noticed a weird catch 22 in the focus tree. After defeating the Raven Rock Enclave alongside the DC settlements, it white peaces (I assume so they can give Adams Air force Base to Raven Rock). Because of this, DC settlements gets Raven Rocks old territory.

I checked both of our focus trees, and noticed this. I can't progress my focus tree, as I can't take the focus 'Fall of Raven Rock' due to not owning Raven Rock, meaning I can't progress to finding the Enclave in Adam's Air force Base and going to war with them.

So I checked the DC settlements focus tree, and found the focus 'Treaty of Raven Rock' which does transfer Raven Rock to the Lyons Chapter.

However, they can't take that focus, as it requires them taking 'The Aftermath' which they can only do if Raven Rock doesn't exist.

Problem is, The Enclave at Adam's Air force Base still counts as Raven Rock.

So I can't get war goals on Adam's Air force Base due to not owning Raven Rock, yet I can't get Raven Rock because Raven Rock still exists. And the only way to destroy Raven Rock... Is to invade Adam's Air force Base.

Am I missing something or is this just broken? Is my only solution using Console Commands to give myself Raven Rock?

Any help would be appreciated!