In-form Tristan Stubbs should bat in Proteas top-order at T20 World Cup