Excellent station , staff very friendly.
You will see 156/158/170/221/322/43/91 and a class 90 and 67 usually stabled.
It is best to go to the end of platform 11 as there are no ticket barriers on this platform,but you will need to go to the opposite end of the station to get the class 322.
On the down side very little freight goes through this station.
Well worth a visit if you still need some units.
Plenty of food outlets just outside the station,if you have time may i suggest you go up Scotts Monument 5 mins walk from the station,fantastic views of Edinburgh and the station.

At Waverly you will see 150/156/158/170/220/221/43/91 and a class 90 and/or a 67 stabled at the south bound end of the station. You will see class 90 on the North-Berwick. Plenty of places for food and drinks.
If you want to get lots of units & still get GNER loco's go to the end of platform 11 (north end) because that is the only platform to have no ticket barriers at the N/B end. Also if you come early (or late) you will see the sleeper. It comes from Euston hauled by a 90, then splits at Waverly. One portion to Aberdeen by a 67, one to Inverness by a 67 and one to Fort William by a 37. Freight is very rare, I used to go to Waverly every Saturday when I lived up there and I only saw the odd one.