I have done M3 cams, larger MAF, flywheel, diff, custom chips, injectors, etc. etc. on the M50tu. If you do the M52 2.8L then I would suggest S50 cams with them. After that, either whole S50 or S52.
Now, dropping in an S50 is the best overall solution and I do understand about the bent valve. Been there. The key to this is doing the work yourself. So, an M52 2.8L is a great solution. S50 is very ideal.
Also, you will spend a lot more money over the next year trying to extract more power if you don't get an S50 or S52. Trust me, whence the S38 in my 525i. So, if you have to do the work yourself, get the valve replaced, and save/search for an S50/S52. One other thing, if you get an S50, upgrade the valve springs to the S52 ones. They are stronger and will not float as easily as I am guessing you bent a valve by over revving the engine.
This is a critical time to do planning and bugeting. Hope you make the best fit choices.
I remember years back I had to work my M50tu engine hard to get it to go. It was fun, it really kicked, and with slicks, I beat an M Coupe off the line....hehe, when I engaged the clutch at ~2500rpm, the tranny knob shifted more than an inch to the side b/c of the hard launch. However, it had to be worked and could get real annoying fast. It did need more torque down low for the large sedan.
Good Luck with the project.