I just setup a mixed team just prior to 6.0.2, so far the steps outlined are less verbose. I know a lot of abilities were removed/"compacted" into others, so I suppose it's to be expected.