I agree that if you spend that much time in HK then Shanghai is a bit redundant. Those places between Xi'An and Beijing are more interesting. June is a busy travel month, book as much of it ahead as you can.