RColt with Rays 57C Gram Lights 17x7.5 & 8.5 - I need a new daily wheel?

FIRST WORLD PROBLEMS
Want bigger brakes but at what cost!
Ok!
So I race with some 17x7.5 +30 and 17x8.5 +40, 2002 vintage wheels.
They run Hankook Z221 medium compound in 215/45 and 225/45
I also add a 25mm spacer to the fronts and a 10mm spacer on the rear :) H&R do a 67.1mm Centre bore spacer






Problem is, if i upgrade my rotor to anything bigger than i currently have I can't use my rota grids 15x8 +0 /rota-grid-15x8-0-z7ag.html
UPDATE: I am shocked my 294mm discs actually fit under the 15" wheels!













Solution 1: run my modified evo calipers with a 294mm disc on my track rims and switch them over to the 276mm rotor when i finish at the track. Its actually super easy to do.
I have a bracket to convert the twin pots to a 294mm disc ^_^
UPDATE: I am shocked my 294mm discs actually fit under the 15" wheels!







/z27ag-rcolt-mr307282-with-294mm-discs.html









Solution 2: upgrade my rims to something else. Why? Future proof myself if I ever change to brembos or the UCF30 calipers (min 16" wheel) /calipers-arrived-ucf30ls430-sumitomo.html
What would be ideal if i could find an exact copy of my current track rims.

Rims:
* 16" ENKEI RACING RS 2PC
      - 16x8 Offset +32 4x114.3
* 16" RPF1
* 16"/17' SSR Professor