Your thought of getting a second scroll saw is a good one if you can afford it.
In 2008, I bought a new 20" Hegner Polymax and a few months later a friend, from an on line forum, told me of another for sale, on Craig's list, near me. I bought the second saw for $600 as a back up. It is a, like new, 25" Hegner, made in 1986. I have, on occasion, had need for a larger saw than that new 20" Hegner and this second saw fills that need.
I then found an old 15" Jet scroll saw on Craig's list and got it for $15. I adapted this old (1988) Jet with Hegner clamps so all my saws work the same. I now have three saws. I have one set up at the required angle for doing my inlays (2.2°) and the other for straight cuts with the 25" saw in reserve.
Life is good!