Hey Cap,
You might have to progress Raes story and lewdness to get the shower scene with her.
Same with Naomi. Once you have booze from the fridge, you might have to progress with her a bit too.
Hope this helps, if not, lemme know and we can have a deeper dive o/