I haven't confirmed this, but I think you can swap companions as you wish.

I dropped Raul so that I could get Cassidy and Raul just went back to the lucky 38... but I guess you probably have to have been there for this to happen. I haven't gone back to see if I can just get him back if I wanted him.