Hi Sylvie,
I did the same trip with the same flights in July and the timings were absolutely fine. In Edinburgh ask to have your luggage checked through to Beijing and you only need to catch the shuttle to Terminal 3, which is well signposted. There was no queue at Air China when I got there and that was mid-summer. It is a wonderful trip so relax and enjoy!
Lois