Electras (
http://www.electras.ch/) sells high quality stuff, but I think the closest location to Genève would be Bern, perhaps the Basel shop. I bought a then-new Olympia Cremina and ECM grinder at the same time at the Bern shop, and they gave me a nice discount.
You might try haunting open markets. Some nice machines can be found. I nearly bought a ridiculously inexpensive Olympia Club at the Vevey market a few years ago, but I really had nowhere to keep such a heavy machine.
Have you tried looking at Ricardo.ch?
As you probably know, the big shops are not worth going into. Everyone seems to want a Nespresso or automatic machine.
HTH
-Daniel