Try:
- Change the option to select Save in Original Folder.
- Quit Photoshop gracefully.
- Open it again.
- Now see if it chooses Save As locations that match your original document folder.
May I also suggest working on changing your habits so that you can try to learn to pay a bit more attention when the Save As dialog comes up.
-Noel