Cumberbatch would be perfect for the role, yes, although it would be weird to have him as the lead in two Steven Moffat shows.

Spoiler-free review of the upcoming episode.