Congrats. In the event that your speakers maybe a little too big for the room, I think you are covered in that case by DSP.
If you use digital streaming and digital files for playback via ROON or JRiver, you can use convolution files to adjust the response curve to the room. There is a guy up in Canada that I will be working with (remotely) to get the NS 5000 to fit into my room. My room is only 12x11xx9 (plus some extra space).
I asked him whether his DSP expertise can make the NS5000 fit into my room via the photos I sent him and he said no problem. I found out about the convolution based approach to DSP from reading the great discussion on Computer Audiophile web site.
The founder of the site has a nice review of what I will also do.
https://audiophilestyle.com/ca/bits-and-bytes/a-new-listening-room-part-two-acoustics-speakers-dsp-r863/ One great thing about using this approach to DSP is that you can use any preamp. I was looking at preamps like the Lyngdorf 3400 (integrated), Linn Selekt, Anthem, and another dedicated DSP device int he $1000 range (forgot the name).
Reading posts here and on Computer Audio files leads me to believe the convolution file based approach could be the best if applied properly.
BTW - the warranty on the NS5000 in the USA is now 2 years. I was told 10 years in Canada from the same dealer you likely went to in Canada. However, it looks like the Yamaha accountants got involved and lowered it everywhere.