Towards an improved subgrid-scale model for thermally driven flows