Ange Hostile Takeover Quest Bug - Hardcore Death to Softcore Play

I have recently died in Hardcore on my 77 Witch - she's further than any of my softcore characters this season by a mile.

As result I have had to go and reclaim the Reforging Bench and I noticed Ange wasn't at the Shoreline Hideout.

I checked my active quests and I'm on the "Hostile Takeover" part of this quest which requests I speak to Ange - when I click on the quest it specifies "Speak to Ange in your hideout".

I go to my hideout again, Ange is not there. Now this is where the reading comprehension of my problem becomes important:

I read online this is a bug and all you need to do is change your Hideout from one type to another then change it back to Shoreline Hideout, so I select the Felled Hideout - then talk to Alva to revert it back to Shoreline and there is no Ange.

What remedies are possible? I've tried relogging, I've tried closing the game. I've tried logging out completely - setting my Hideout to Felled then closing the game, relogged in and change to shortline but nothing is working.

There is nobody in Kingsmarch to go to, I tried doing the Whakapanu Island quest again but there's no quest to do. The Shoreline Hideout on the Act 4 map is not greyed out - I've cleared the Whakapanu Island completely again AND the Cave - nothing. I've tried finding her at Kingsmarch - nothing.

Am I locked out of Ange now? This is driving me insane.

For those who may be having this issue: If I talked to Ange in Kingsmarch, she has no quest or dialog options however she does give you the option to change your Hideout. I requested she change my Hideout - I selected Fel and then Shoreline then she appeared at Shoreline.

IT HAS TO BE HER IN KINGSMARCH YOU TALK TO IN REGARDS TO CHANGING YOUR HIDEOUT, NOT IN YOUR HIDEOUT - IT CAN'T BE ANY OTHER PERSON.

This is dumb and super not intuitive because I've always talked to Alva in my Hideout to change my hideout layout and it specifies you need to talk to her IN YOUR HIDEOUT.