I posted a blog about this with a handy chart too, feel free to check it out:
Good luck and congrats on your new home!
Keller Williams Realty
Here are two links that should help clear everything up for you:
California: http://www.ftb.ca.gov/individuals/ New_Home_Credit.shtml
This goes to show that free money isn't fair money. I'm sorry for you bad timing but I believe that you should get the Fed credit if you qualify and if you read the fine print on the CA 10k the fed credit is usually better.