Hi there. I posted the above question quite a while ago and got no response. So I will respond to it myself in case anyone is interested. I ended up studying Catalan at a small language school called Versión Original near Placa Catalunya. I did one-on-one classes with two teachers from the school. I learned a ton, and I would highly recommend Versión Original. They don't typically teach Catalan, but if you ask they can probably accommodate you. They do teach Spanish though, and based on my Catalan experience, I'd recommend them for Spanish classes. Also, students studying Spanish there told me their classes were great.