Intensive Portuguese course? Surf camp? (Lisbon)

Dear Lisboners,
I'd like to take intensive Portuguese language course - in the week of Protected content . Intensive - meaning a couple of hours per day.
Would you recommend any good school or institution for that purpose?
Flexibility matters to me: I'm not a complete beginner, and thus would like to have my level of Portuguese checked before I start the course. I'm considering also individual classes.
Ideally (to make the most of my time in Portugal), I would also take surfing or kite-surfing classes during that time - any tips on this? Any surfing/kite-surfing schools?
I've seen some surf camps websites, however don't know if there are any options for mixed Portuguese + surf classes.

Well, it all sounds complicated even to myself, but maybe any of you - Lisbon local scouts - has some ideas on this!

Your help would be enormously appreciated! :-)

Obrigadinha!

Joanna