Preparation of cis- and trans-2,5-dimethoxytetrahydropyran and cis- and trans-2,5-dimethoxy-6-methyltetrahydropyran