Looking into speaker upgrade/change?

Between those two I’d probably go with the Classic 30s mostly because of AP’s 3D imaging prowess that I think would pair well with your amps.  But frankly, at that price level I’d choose the Joseph Audio Profiles over either as you’re getting the lion’s share of the Perspective’s performance at a huge discount.  Best of luck in whatever you choose. 

Great amp!  Clayton doesn’t get near enough attention IMHO.  Anyway, my tastes agree with yours on all the speakers you mentioned.  If that means anything, there’s a nice pair of Usher CL- 8571 lls for sale here now with the upgraded diamond tweeter for $3400 that are insanely good and ridiculous at that price.  Usher is another standout that flies under the radar here for whatever reason.  If they don’t work for you, there are Joseph Audio Perspectives (original model) that can be had near $6k that are also awesome with a smaller footprint, and you can get them upgraded to the Graphine version if you ever feel like it.  Given your amp and tastes these may be worth a good look.  Best of luck.