Keep the stock motor. Rebuild it. Run it another 200K+ miles. Keep good gas mileage. Make people jealous of said gas mileage.
But.....since there is an option....build the stock motor. Do what few people do and build a D15B. Hell, make it a sleeper. Bore it to Z6 status and boost it.