Unmoored World Need Help

So I'm in the unmoored world. Was able to use the Elven blacksmith but not Gustaufr however Sarah(dwarven blacksmith apprentice) was able to help me. I needed some materials for both Magic archer build and fighter build(pawn is fighter I'm going MA) so for MA I've been upgrading via elven and then using dwarven for my tanky pawn. So after doing all the evacuations as well as fighting multiple variants I needed(such as gorechimera) I finally got the majority of items I need(minus medusa mats). So I wanted to upgrade my pawn's gear but when looking around the Sea Floor Shrine all I can find is the Elven. She is in a cluster of ruined buildings next to the portcrystal. Can't find ANY OTHER TRADESMEN. Outside of the RC vendors(Dye and glasses) near the Riftstone.

Am I just stupid or what is happening? Are they supposed to be all together where I found the elven smith? Or are they somewhere else? Another problem I'm having with finding them is in the respective areas where each individual kingdom or group evacuated to the shrine I'm having like 10-15 npcs pop in right in front of me, then turn around and there's like 20 npcs that weren't behind me earlier. Are the smithy's near where I found the elven one near the Portcrystal or are they somewhere else? Do I need to rest? I haven't rested once since entering the Unmoored world. Or do I just have to wait til NG+ to upgrade my pawns gear? Any help greatly appreciated :)