Yes, that was it - I switched to Lightroom Annual before cancelling. Moved to outright buying Capture One, not for speed but image quality, colour rendering and controls are first rate, and Photo Mechanic for ingest.

Raster graphics - Affinity and an older Mac with Photoshop CS something :D