Let him go on giving mediocre to bad films like Welcome, Singh Is Kinng, Housefull 2 or even Tees Maar Khan, I wouldn't care as long as he keeps doing films like Special 26, OMG! Oh My God etc... once in a while.
My vote will go to Masala-Action since I know he'll doing comedy films. He's already typecasted in comedy roles to an extent where media portrays him as if he hasn't done any roles other than comedy. But more than Masala I would want the kinda Action which you expect from the Khiladi not the ones which was there in Khiladi 786.