One more vote for selling the Passier...
I, too, have had this dilemma. Happiest day of my life when I sold (expensive name brand here) A\P saddle that I couldn't get a good jumping position in to save my life and bought the $600 used Toklat Passport that I'd been borrowing for lessons. Honestly, I think a lot of alleged A/P saddles are designed for looking pretty on the flat and nothing more. :)
The Toklat was supposed to be a stopgap measure, but I rode in it for 2 years and still use it on my youngster (other horse has outgrown it). It has foam panels, so can't be reflocked, but I've sure gotten my money's worth! :D
I subsequently bought a Barnsby dressage saddle and a Black Country Quantum, both used, which I currently event in. The Barnsby I happened across at a show, and the Quantum I hunted for until I found it on Tacktrader. Love them both, and they fit my competition horse well (he is medium wide tree, medium-prominent withers). I say figure out what fits you and your horse, and then patiently hunt for a used version at a good price, buy it when you see it. No doubt you have friends with various & assorted saddles - that's a good way to try without any commitment. :)