To me, A. 'Hadn't' sounds correct. And in your second sentence, B. 'resist' sounds ok. However, it'd have been more appropriate if the sentence had been "You're staying with me, unless you resist."
Well, I don't know about the subleties; however, I'd try to explain this to you.
Had your first sentence been "He did get his flat redecorated", 'didn't he?' would have made more sense. I think, we should keep the tenses parallel. Did with Did & had with had. Thus, it'd be he had his flat redecorated, hadn't he?
2. You're staying with me - seems like an order. Therefore, You're