Looks reasonable to me, the only thing I'll add is, don't be too eager to pencil in the next wave. Time and time again I get caught out not giving them enough time to play out, i.e. the (B) you have marked there could well be a smaller part of the (A) wave.
