To update... Las night was the first night in a week that H. didn't end up in my bed at some point last night. He did wake up at 3:30 for his soother, and was awake at 6:15, but it was still the best sleep I've had since we've moved.
Baby steps. We'll get back to a full 12 hours with no wake ups. I'm sure of it.