yeah I would be annoyed also. I knew that my late 2013 has his issues after hard usage (battery swelled, etc) so I need one really soon, but I knew that the 2019/2020 will have a new model so I waited exactly for that.
Have you gone to apple for the battery swelling issue? I took mine in after part of the trackpad stopped working and a fan starting whining non-stop. They ended up replacing the case, battery, fan, and potentially even the keyboard and screen (looked like it from what I could tell) for only $300. It felt brand new when I got it back.