I'd just keep with the 2L pinto, use a 32/36 and if rebuild needed go for +90 V6 pistons for 2086cc, makes a nice car that can give good mpg, you may need to look at diff ratio though with it being estate ?
tabetha