Funny, when I originally said "if I had to do it again, I'd do 15mm/25mm", what I really meant to say was that I'd go with 18/25. WHich is what you are doing.
My car currently has 20/25, but the front sticks out just the slightest amount. I can live with it, though.
