Did I do the right thing?

Yes, you did the right thing. This guy sounds very immature and doesn't know what he wants. Sound like mine to be honest with you. He has to realize he cannot break up with you and get back with you whenever he wants, he will continue doing this. I know its hard, I am going through the same. But my suggestion, if you do decide to get back with him, agree to it as friends only, you need to start calling the shots, and start seeing other people too!