CHAMP and GOCE thermospheric wind characterization with improved gas-surface interactions modelling