Looking great! And, another idea on the surface rust in the front might be something like Ospho. Not sure if anything like that is available there, but it is just a weak phosphoric acid. I was amazed what it did to similar surface rust on my C10 pickup. It went from orange back to blue just wiping it with a rag a few times. I can see if I can find before and after pics. I haven’t even buffed it or anything and it made a huge difference. Edit: Found a couple pics. I just wiped it on, let it stay wet, wiping it every few minutes until all the rust disappeared.