Something that might help you out also is macroing your shifts.

With my 1 boomkin I used to hate switching into owl form in a hurry and wanted to cast moonfire while shifting.

/cast [nostance:6] Moonkin Form()
/cast moonfire