Hey man, if you intend to do more landscapes and indoor assignments for church you would love what a full frame camera can do with your 17-40 F4 L & 24-105 IS F4 L.
If you're ok with the price I say just go for it, or look for the 5D also if you dun fancy HD video and dust cleaning sensors. I...