I went back and updated my graphics. I kind of got lucky because I already knew that I might need some different graphics, so I held off on most of them just in case. I only have a few items that I will need to re-draw from scratch (which might be good anyhow).
I updated my project to have the @2x graphics files and they all seem to work fine in the simulator for the iPhone 4.