Noob question - Wheels without SPACERS!?

[DeMobBoss]

Hi peeps!
Noob here!
I recently acquired a car I've known for several years and finally now that its mine I wanna 'make it mine'.
Its a UK delivered RHD 1982 911SC which went back to the factory in 1987 to have a Slantnose body retrofitted via the Sonderwunsch program. As per the pics I've uploaded on here, you can see it came with some tidy looking Fuchs rims with massive spacers all round. while these would make nice club 'show and shine' rims - I just hate the handle & feel of spacers.
So, I'm on the hunt for some wheels preferably larger rim size 17' or 18' but am unsure of what offset to be looking for in order to do away with the spacers, given that the car started off life as a narrow body but is now a widebody. I've been given the following measurements by a reputable rims manufacturer of the period who shall remain unnamed:
18x8.5 5/130 et30 – Front
18x11.0 5/130 et08 – Rear
Does that look right - if not can anyone advise otherwise?
Much thanks in advance!