I have a similar situation as you. But honestly, I do not see a point in buying a more efficient gear with mined BTC. There is no way, the new gear will ever earn me the same amount of BTC that I had to pay for it. Therefore I am waiting for post halving prices and I might buy some new S17.