Congrats!
I very nearly bought an ED40, but didn't, so cannot help, but congrats on what I think is an excellent car. I should think the 18's will be much better, I would have done the same had I bought one and had it had 19's. Comfort aside, they are the best looking wheel IMO.
Good luck