Ha! I completely missed your link with photos. Now that others have commented I saw it and see what you mean.
I agree your room will be a much bigger impact on the sound you have than a change from the M22 to another version or even the M5. I’d put most of your money and effort into sound absorption materials, perhaps MASSIVELY thick curtains as nickboul said.
If you are totally focused on upgrading then go to the M5. I spoke with Debbie and there really isn’t enough difference in versions (according to her) in the M22 from the first versions to the lmost recent to warrant an upgrade unless yours are damaged somehow. They will accept yours as trade Ins as well. The M5 should have a notable performance improvement.
