Yeah, the locking part with WF is somewhat annoying. I hadn't seriously considered Citi, so I'll dig a bit deeper there.
I am not going with BoA either, because a couple of my friends have had horrible experiences and their rates don't seem to be very competitive.