18" wheels+ER suspension overhaul

[hangar21]

All, please forward your recommendations. 87 911 Cab-Staring ER street/track 2 suspension overhaul later this month, PO had installed (964) wide body kit with 18" Cup Replica wheels;
front (Falken 452) 225/40ZR 18 92Y, spacer 1.65",
rear (Falken 451) 285/30ZR18 93Y, spacer 2.010"
3of 4 wheels are marred from PO using auto car wash, they will need re-finishing ( polished or blacked out?) if I keep them. I'm not opposed to purchasing new wheels (17" or 18"?), not sure of wheel offset or spacers needed? Here's pix of curtain wheel/ spacer set up. Thanks in advance
Terry
Front:


Rear:

Wheel: