What route did you end up going? I am in the same pickle after deciding to get back into cycling this year.
Being as overpriced as the market has become since I last road 6 years ago, I feel the Roscoe is starting to become expensive once upgrades are added too. Then I might as well start looking at an FullSus like a Specialised Stumpjumper Alloy.
If prices were not so crazy, and if I wasn't waiting on the birth of our second kid, I would be looking at financing a Fuel EX 7 fory all round MTB.
But reality has me looking at my wallet and I am back to the Merida Trail 500 (400 only seems in stock so needs same upgrades you stated) or Trek Roscoe 7 (marginal upgrades).
Another option which I am pondering about, to import a Nukeproof Scout from CRC in the UK. Supposedly no import duties apart from VAT according to SARS list. With exchange rate, shipping and VAT, sets me back just over R32k.