You need to clear immigration at Geneva, but you do not need to claim luggage. I've changed plans there myself coming from the US, though not recently, and things move pretty swiftly. You should be OK as long as your flight arrives on schedule.