Agreed.
Put on some nice Jap rims with big brake clearance. They will be lighter, stronger then the XXRs, will fit better as they don't need spacers (which are also illegal) and if you ever upgrade to some bigger Brembo, Project Mu, Endless etc. calipers you won't have the same problem again.