What would the best option be to get more power then? A different engine swap, or turbo'ing the 1.8 ...