I just found it and watched it all, sighed and thought "I guess I will have to wait ages for the 2nd series.." I got lucky.

It seems that they have the same thoughts as me on what made the 1st series weak. They will be have two hour episodes instead of one hour episodes now. Whether they are two parters, I do not know.