Wanting to upgrade my speakers

The Linton is a safe choice—very plain, but elegant. Its nimble, articulate bass and expansive soundstage are charming when properly paired.

I'd go for a pair of JBL 4333 studio monitors or the home equivalent JBL 300's. A McIntosh apm with 200w.p.c. would make it even better Personally never been a Yamaha fan.

Take a look at the Usher Dancer Mini-Two speakers that are about the same price as the MoFi.  Gorgeous high-quality build and sound and simply an outstanding value for what you get.  One of the few companies that makes their own drivers, which is why these get the same diamond tweeter used in their $42k flagship speakers.  Read the reviews, and this dealer offers a 10% discount and returns if for some reason they don’t work out. 

https://soundapproach.com/usher-mini-two-2-x-7-2-way-diamond-tower-speakers-pair.html

Buying the Warfdale Super Lintons would leave me enough money to get a new sub also,max is approximately 5K

@garrymac get this subwoofer - Power Sound Audio S1512m