having a prop or two on hand is all part of Donzi Classic ownership, the hulls are very prop sensitive. I forgot about your altitude you numbers are close to mine but I am around 240-250 ish HP and a much bigger boat. If you like fast and loose the 22 ultra may be a prop to look at Hill also makes a prop for the AQ .
Woobs has a good idea if there is a shop that will help you for a sale that is the way to go.
when looking for a prop your idea of handling and slip are the big factors. usually 10% slip is the target number I have run faster props than the solas but could only take advantage of that extra speed for seconds in the right conditions and could not keep tract of all the handling quirks.
run your numbers thru the prop calc the ultra runs at about 15% slip and can go higher the faster you spin it. I would think going up to a 22 ultra would keep you around the rpms you are now maybe a bit lower I would say no lower than 4800. the bow will come up it will ventilate in harder turns and rough water but when you can find calm flat water you can fly the boat it will be fast and loose. I ran a 22 and 24 ultra on my 16 and it wasn't a bad prop but was a handful when pushing it or when having to make quick adjustments.
not knowing your motor and the altitude going to a 21 solas may put your rpm down to low 4500 or so