You also do the velcro+aluminum block off plate thing, if the 25-row ends up being too cold for daily driving in the winter up there in the northeast (e.g.:
DIY: Oil Cooler Block Off Plate). Whereas if you go too small, you've gotta buy another core and replace it, etc. If I were you I'd just go larger right off the bat.