I didn't take the plunge as at the time the local Focus dealer was out of stock and couldn't give me a firm delivery date once ordered.
I dithered around for a couple of years partly because I can dither on such matters and partly because I was ill and off my bike for some time (recovered now).
The bike I eventually ended up with is a Trek Domane ALR 5 Disc - the RS505 hydraulics on this are superb and no way would I ever bother with rim brakes again.
AFAIK TRP Spyres are v.good cable operated discs - no idea why yours aren't work so well. Have you tried asking the question in the Mechanicals section of the site?
Although if you like your bike and you like hydraulics then you upgrade plan seems like the way to go!
Good luck whatever you do.