yeah, 24-105 is probably the better choice. I hadn't thought about the DOF being different on a full frame...that along with the improved ISO performance, I think f4 will be fine for most scenarios.