You are undoubtedly the better swordsman these days - I've had no more challenge than the aforementioned spiders and occasional bandits in the two years since the Inquisition disbanded.
And I will be pleased to assist you in moving whatever needs to be moved for Satinalia, but you're welcome to keep the office. Skyhold is a large enough keep with plenty of empty space - or at least it was when I last saw it.