I have visited the Château de Chillon many times and am always very impressed with both the situation and the great job they did- and are still doing - with the resroration.
It is definitely a must see for anyone in the region and you have given an excellent feel for what to expect.
Did you get all the way to the top of the tower? That takes the breath away.