yea its up to you on what to do with your sunroof issue, but you should swap it eventually, thats what i'm doing with mine. You must have the dohc. Ehh you can swap a bp,bpt,b6t in your car. All very nice swaps. Might wanna look into the bp or b6t, bpt is too complicated and expensive.Peace