安徽：travel to Huangshan

We are planning to visit Shanghai, Huangshan and Hangzhou in June. We will arive Shanghai first and leave Hangzhou to Australia.Also we plan to travel with public transport. Or we should travel from Hangzhou to Huangshan because Hangzhou is more closer Huangshan than Shanghai? Am I right?What is the best routine to visit this three places? We will stay in Huangshan for two nights. Should we stay in hotel on the top of hill first night or second night? Thanks!