They don't have many power based veterans on NXT to work with them in that style, so I wouldn't be opposed to Bubba Ray making a return, or maybe bring someone like Kane down from the main roster.
As far as the Divas, they really couldn't have picked a better option than Michelle McCool...