You're right, the shifting mechanic should be more fluid. To that effect, I've added the Rapid Shifting and Instant Shifting class features, and updated Swift Shifting.In general, I quite like the class. It's strong and flavorful —*but I feel like switching back and forth between Avatars should play a more prominent role in its abilities, possibly at an earlier level. Switching as a full-round action 1/encounter at level 3-5 would be fine, I think, and not much more powerful than Adaptive Style. Then you could have the ability scale, probably by allowing the switch as a standard or move action, and pushing the 1/day swift change farther up toward the capstone.