2005 Civic Si. Stock 16 inch rims and tires. What is a good size upgrade as far as ride quality and performance. I would like to be able to sip a drink without it splashing all over me on bumps. Perhaps up to 17"? How about tires? The stock tires suck in the rain I want something good all-season.