I Fought the Law Quest bug - Can't Talk To River

I went to meet River at the Warehouse so we could investigate the Red Queens Race but when I arrived and got off my bike, the quest marker suddenly jumped back into town next to the Luxury Apartments. I drove back and the Talk to River marker seems to be underground and theres no way to get go it. (the dotted line disappears when i get near and just leaves the Quest marker under a building).

I’ve been back to the Warehouse, cleared it out, gone down to the Red Queens Race (which has no one in it) and explored the whole area but the Quest Marker just sits at Talk to River and directs me back to the Luxury Apartments in Westbrook. I’ve also tried calling him but he doesn’t answer.