The short term forecasting of wind speed and direction has previously been improved by adopting a cyclo-stationary multichannel linear prediction approach which incorporated seasonal cycles into the estimation of statistics. This paper expands previous analysis by also incorporating diurnal variation and time-dependent window lengths. Based on a large data set from the UK's Met Ofjice, we demonstrate the impact of this proposed approach.