Just hang on in there for exactly what will fit for you, only you know best.
By the way, andalusians are wonderful horses, but they are a very specific kind of horse with very specific traits, not a more general, versatile horse you can do most anything with, although you can find in them, as in all horses, some that may do it all.
Purebred ones tend to be, if the jerezano, the heavier type, used for both, high school demonstrations and driving, of restricted gaits.
Neither of both basic types, the other the leaner cartujano, really are much of a forward horse, which is great for what they were bred for, but maybe not for so much we do today with our horses.
Now, crossed right, you can have most anything you want, as they pass on their wonderful puppy dog, happy, willing disposition and their gaits improve if you cross with other breeds with very nice gaits.
I hope some day you get just the horse you want, there is one out there.