Sorry for the late response, but I heard there may be a work-around to getting both the OG scene and the thank you scene after Araj. I don't have the save anymore so I can't test it yet myself, but supposedly once you get the OG scene, don't long rest and then talk to Araj, refuse her request regarding Astarion, then long rest and the thank you scene should play. Supposibly the person got it to work that way. Idk. Here's hoping Patch 3 fixes the romance dialogue greetings not updating.
