Aero 3 won't be coming back, given the design team's move to more light based/holy based attacks so I say give us Diaga, then. Give WHM raid utility in the form of Bravery & Faith. Aside from that, I'm happy with how WHM is playing so far, with the exception of the afflatus abilities feeling... weird due to their being on the GCD.