I completed it without issue since the drop of the DLC. My suggestion would be to not do any upgrades until you’ve built the Spirit Way and complete the ones in there.
It’s finally fixed for me now. I’m annoyed it took as long as it did to fix it but at least they did it.