Having owned both, I would go for the P7; it rides like a scalded cat and always brings a smile. It’s the one I kept.
I wouldn’t worry about rust like that - some aluminium foil and soapy water will get that off. Afterwards I use car wax to keep moisture out, it only needs doing once a year...