$0.02: bigger is better; listen to your wife: size matters.
Also heard here: torque is addictive, and you can't have too much. there are reliable ways to get more performance out of these ACVW engines, and at this juncture (you're only waiting FOUR!!!!! weeks -- that's nothing) I'd say do it now. If Kirk can't do it, there are a few engine builders that will ship anywhere, I'm thinking. Way better now than later, IMHO.
And WAY TO GO!! Always nice to have another inmate in this insane asylum. Too bad you're just another face in the crowd out there in fun, sunny So. Cal, where Speedsters (real and imagined) are almost a dime a dozen, and you can gather up and enjoy the company just about any week end. Be sure to take MUSBJIM up on his offer. He is a 1st class dude, and has many hours (should I say years???) of experience to share w/ you.
You're gonna love it.
PS: And what else are the guys who have 1600s they want to sell to you gonna say: Buy my car, I hate it because it has too small an engine? Not.