Hmm.... It's hard to know what to suggest - it is strange that NNDs aren't working now. Unless that really early waking was a one off thing? I can understand why you might be nervous to try it again, though I can't think what else to try. Could the EWs be because you're away? We've just had a run of short nights cos we were away (he always EWs when we're away), and then J got OT from them, then UT cos I let him nap one day, which all prolonged it.
Also... Seeing as you're properly into the 1-0 now, I wonder whether you might be better off starting a new thread specifically about 1-0 help? I'm happy to continue to support you, but you might get more people chipping in with ideas than on here, cos people won't read a 17 page thread, or know we're talking about the 1-0 now from the title. I only have one way to deal with the 1-0 and that's to keep the NNDS going at a steady rate, even after a short night if need be, and only to offer a very capped nap if I see J really needs it. I don't know if you ever moved her nap earlier but I'd do that too, and let her self regulate by refusing it every now and again. But J handles OT extremely well and others will have other things to try for LOs who don't so well.
What do you think? As I said, I'm happy to continue to support you - I just feel like I'm giving the same advice over and over and if it's not working then perhaps it's worth seeing if anyone else has anything to try?