Your amps are fine - no need to consider upgrades here.
Regarding speakers, we don't have measurements of many wharfdale here, and those we have are a bit of a mixed bag - two recommended, two (higher priced ones) not.
I'd suggest looking through the list of speaker reviews here:
www.audiosciencereview.com
(click on "speakers" top right of the brown bar.)
Sort by the recommended column (click twice to get yes at the top)
Then look through the reviews recommended of speakers which are in your price range, and available in your region. If you don't understand the charts and graphs there is s video explaining them here - or just read the comments and conclusion.
Collection of Amir’s instructional Videos for reference, refresher and new members: (“Behind the Curtain @ ASR University”) Welcome New and returning Members of ASR. Our Host Amir has put together a collection of comprehensive instructional videos that might help new and returning Members...
www.audiosciencereview.com
(Third video)