Tom,
This is GREAT and the difference between night and day.
Now THIS is a church sing-a-long song. Yes, you did it.
I can see a P&W director using this and doing his own band arrangement, but keeping this feel.
It has real drive now and it very catchy and has momentum.
A phenomenal difference.
Great rewrite man.
CONGRATS!!!!!!!!!!!!!!!!!!!!!!!

P.S. The bridge is cool now, but you are tripping over the words a teeny bit (or "she" is.) It may need something simpler word-wise to flow into chorus. Seems a little rushed with that many words. Can you think of something simpler? Overall, though this one is one heck of a dynamite rewrite.
P.S.S. Don't mess with the length now. 3:30 is perfect. Any longer and you will start to ruin it. This is tight.