Looks like a pretty good effort to me mate
It's not the nicest stuff to have hanging around but I reckon an OA bath then autosol is just about spot on for this job. Coke n foil defo works but some parts of frames can be a right pain in the hole to get at and the OA takes a lot of the early legwork out of the job. Autosol is the best thing in the world ever though - its amazing what it can make respectable again...might try some on the Mrs