Maximum stay for H-1B is 6 years, which includes the time you spent on L-1B. 
I agree with my colleague with respect to the 7th year extension of H-1B and beyond.