I don't have experience upsizing tires, but the consensus around here is that it's usually cheaper and lighter to only upsize the sidewall height and keep the 15" wheels you have.
Also, here's an updated aero template for you--the key to lining it up is the roofline, which isn't actually so bad
