It got slooooowly better after we nightweaned at 20mo. He didn't STTN consistently until around 27mo, though (about 2 weeks before dd was born: AARRGGHH, the irony). Bedtime was a huge struggle until we stopped napping during the day. He's still not the greatest sleeper (at almost 4) and right now is waking up too early, but it's a billion times better than those awful days you're describing.
Hang in there!
Hang in there!






