How deep was the water? How long was it in it? your post makes it sound like it has been under water for 2 years and will not be on dry land until next week.
Any way besides what you mention I also would disconnect the fuel line from the carb and spin hte engine until clean freash gas flowed. If the water level ever got above the carb it may need to be rebuilt be fore it will run well. Also remove the distributor cap and clean/dry it out.
Depending on how deep/long the car was under water you may have to contend with multiple long term problems such as: mold, rust and especially electrical.
I'm sure there are many Cadillac forums around I just do not know of any specifically. Good luck and keep us posted.