Cast Your Perfect Action Film

I like Waltz a lot but he's been the villain too many times now.  I'd like to see him in a mentor role, a la Django, or perhaps the department head/government liaison or something like that.  Cold but still charismatic, great at stealing scenes.