Kroll would have been interesting. Comedians often make great actors. Another actor I think that would have fit was Bill Hader, his work in HBO's Barry is great.
As for Diggs, I've only seen him in Snowpiercer and I wasn't the biggest fan of his acting! But I'm sure he's been good in other stuff from what I've heard??