I personally think that at this early time you should make it. Because Geneva is not in Shengen you should not be subject to passport control, there is only one terminal so you don't need to change terminals. For these short layover staff often waits in front of the first plane to help you get to the second place. And even if you miss it, they will rebook you for free.
Having said that, from personal experience, there is really big chance that your luggage is not going to make it. Last time I changed in Amsterdam they lost it both ways, and I was told it happens often if the layover is less than 2h.