Rebuilding Futuras for E36 M3 swapped E30 - fitment gurus?

I have a set of 8.5Jx17H2E13 Futuras with almost no good lips or barrels that I'm looking at rebuilding to put on my E36 M3 swapped E30. It would be nice if they could fit well on my E36 M3 as well. I am going to bring the centers back to life but having trouble determining the specs I want for the new lips/barrels. I checked the sticky' but i didn't see anyone with my exact setup and I want to make sure I get this right the first time. Hoping you can help. Here's the relevant car specs:

'91 318is
Billstein PSS9 coilovers
Ground Control camber kit
E36 M3 brakes
E36 M3 control arms
318ti shocks and springs

'96 M3
Billstein PSS9 coilovers

WIIH what's the best place to buy wheel hardware for this rebuild?