You are obviously attached emotionally to this car. The project you have in mind with larger engine sounds very ambitious and expensive. Figure out carefully how much it costs to put in a larger engine. To me it seems overly ambitious when you can get an s model with a larger engine already installed. However it is your decision. If it was me I would fix up the your current ride and sell it and buy an s. However it seems like you like fixing......
