Did I make the right college choice?

If they provide the a similar course outline, and each allows you to walk out with the degree you want, then the choice you made is fine. More than fine. It's a smart move. You've avoided financial worries and housing worries. The only thing you've limited yourself with is that you're staying in the same place. If you're happy with that, then you've made the right choice. If you're not happy with it, and you want the move to happen, then change.