I agree with you about 2d, 19d and 20d, clumsy!
I think 21a is OK, one of the definitions is excessively ornate. The state's name is a Spanish word meaning flowery of full of flowers.
I find that the compiler is quite clever at disguising anagrams, I often miss them at first.