For the cataloguing I’d consider Alien Skin Exposure. It started life as a film simulator, but it’s progressed a lot further than that in recent years.
For the Photoshop replacement I keep meaning to try Serif’s Affinity.
Both the above are a one time purchase, and there are time limited trials for both.
Apparently in the States Adobe have been experimenting with doubling the monthly cost of the Lightroom/Photoshop bundle. Were that to happen permanently, and in the U.K., I’d reconsider my subscription.