15 to 20hp is good enuff. More than that I rather change car. Magnesium engine already managed to get 218hp from 2.5cc engine compare to aluminium M54 which churn 191hp for 2.5cc. Like Fabian said torque curve is important. Try Rhommel Tuning as per link
http://romtuning.com/
HP craze is always expensive for NA engine. The fastest way would be induction ie supercharge or turbocharge for more HP & NM.
My advice if you are keeping the car is to maintain it well to make sure it as good as new car for longer time and the list to do as mentioned in earlier post. If not just change to 330, 335, 530 or 740