Ok, now the phone did the flashing thing again. I plugged it in and now it won't even boot to the CWM recovery screen. I'm really hoping that this is just a battery issue and once it charges that will come back. If not it looks like I'm fully bricked.
EDIT: CWN recovery is back! Whew.
I also read the "How to return to stock" directions more and I see that I'll need two files no matter what, so now the only remaining question is do I use v4 or v6?