The best way forth and back beetween Shanghai and hUangshan should be bus. For hotels in Huangshan, I think it is better to stay in the scenic area or on the mountain.
Take early bus from Shanghai South Railway Statin (before 6:30am)to Huangshan. You can also stay at Tangkou, the mountian foot.

Thank You. Your help was much appreciated.