If they let his personality shine more, he'd be in a much better position. Like, in-ring wise he is not a general, but once you give him a mic he can entertain you. They could put him with Drake Maverick/Rockstar Spud since they have great chemistry.
Here are some examples from when he was in TNA and maybe an NXT moment or two where he was entertaining as hell or just a great talker.
One with him all the way back as Derrick Bateman
Him reuniting with someone from NXT where they were once in a romantic storyline together.
And there are plenty of more examples if you look on YouTube, trust me, you'll chuckle.