Here's what I think I'm going to do:

Keep my modified Plan A in place as long as I can handle it AND (I mentioned before what I needed in a M - most of these items are being met as of now, with the exception of MC) as long as my boundaries are met, I will stay in it. As soon as one of those things is broken, I will reconsider if I can stay in my Plan A any longer or if I need to move into Plan B or full 180.