Glad you had a good night - hope the plan works well for you.
I would definitely end the feed and put him down. That's the only thing that worked with my DS anyway. He didn't care taht it hurt me at that age