Yeah, GeForce cards aren't much good, I just sold my two 8800GTX cards and bought Radeon 5850 Extreme cards.
There's a comparison table of all the M/Hash's in the Wiki https://en.bitcoin.it/wiki/Mining_hardware_comparison

Also I have read that yes the Bitcoin faucet is dry but some online foundation that accepts Bitcoin donations has decided to donate them all back to Bitcoin faucet to try and strengthen the currency, so hopefully that will happen soon.