For anybody curious, it turns out I was looking at the wrong website (Chinese Embassy...in Washington DC). I ended having to go to the Los Angeles Consulate, which has a different form from the q1 all together, but is likewise downloadable off their site.
My $3 blue curtain photo machine picture was fine, though they have photo service there fro $10. I ended up going with a Dual Entry Tourist visa (Single was $50 dual was $75), no letter required. They actually didn't even offer a 2 year multiple entry Visa: max one year from the LA consulate. Incidentally, the guy in front of me had a faxed copy of an invitation letter, and they were not letting him get the Visa... they wanted the original. In that case, if you are in a hurry, you might have to write up a fake invitation letter I suppose.
Same day service was NOT available, so I have to go pick it up and pay my $95 ($75 for dual entry + $20 24 hour rush fee) tomorrow.
Also, the fricking number machine was broken, so if you go, don't try taking a number, just start waiting to the far line (the close line is for passport pickup).
By Friday, I will probably be entering China via Hong Kong, which from what I understand, a US passport can get you a 90 day stay without a visa.
See you guys in China