I am a member of the State Bar of California, the Bar of the U.S. District Court for the Central District of California (San Luis Obispo, Santa Barbara, Ventura, Los Angeles, Orange, San Bernardino, Riverside Counties), and the California and National Associations of Realtors.
You can file a dispute with each credit reporting agency; explain what happened, exactly as you are doing here, except with applicable event dates; provide a copy of the deed in lieu of foreclosure and the deed from the short sale. The credit reporting agency should adjust your credit report to reflect what actually occurred in the transaction. If they don't, you can sue them in U.S. District Court.
If you need more personal attention than can be provided in this public forum, I can send you a premium services offer, so as to provide my contact information, and we can take the discussion offline into a confidential setting. Please let me know if you're interested.
If not, then I hope I've answered your question. Please let me know if you require further clarification. And, please provide a positive feedback rating for my answer (click 3, 4 or 5 stars) -- otherwise, I receive nothing for my efforts in your behalf.
Thanks again for using Justanswer!