Sami Zayn has the charisma, the appeal, and the moveset to truly be appealing to this WWE audience in this era.
He's a great face in peril and knows how to work against a bully. (See: Zayn's rivalry with Owens)
Zayn is 31, so I wouldn't wait forever to try and get the new audience to warm up to...