Spend your money on some headers, cams, intake. Cheaper, easier and the power different is not that big from experience.
If you do want to swap your e30...S54 is the right choices... :)
