I was in a similar situation this year when I decided to continue with French after a 10 year break. I went to Alliance Francaise London for a test to determine my level. At the interview I insisted that I did not want to be bored and got assigned to an intermediate level. On the first day of the classes I mistakenly entered the wrong room, which was 2 levels above(From 2B to 2D- again a different scheme), and this is the class I remained in. It was difficult at times, but towards the end I always found the classes easy. Having said that, now that I am in Zurich,I have decided to find private lessons in French with the sole aim of preparing for an intermediate exam and going through everything I need to know for it at my own pace. This is going to help revise and learn anything new and know exactly where I stand. Hope this helps.