Hello Wingshooter,
welcome to AP Forum. For your choice, please make a selection between Photoshop and Adobe Photoshop Lightroom!
1. Lightroom is more a database, with RAW converter as a pixel manipulation tool as Photoshop an AP
2. LR has an import function, keyword function, catalog function and rating orders. So it is more an administrative tool for all your pics you did. Selection for year, motive and so on. your are able to organize your pics. thats the Keyfeature.
3. Photoshop is a pixel manipulator. AP also, both software hasn't any feature to organize your pics. only your head will do it, or not.
My research gave AP a chance, because I didn't want to pay for a trouser an bill montly to use it. Adobe gets these way to pull the money out of my bag.
So I was looking for Alternatives. AP gave me these. in some cases other processes drives me crazy, but experiance will get results, sometime :-)
For managing my Pics I use LR V 5 because it hasn't the cloud feature.
the problem with editied Photos, try to synchronize your folder, you get them. It is an reimporting function ( in these case they are in the same folder. Otherway you have to import the edited Pics.) And after these, you're able to export them.
Good Light