I've got the vest, but labored over the same decision. I still may get a wrap to reduce bulk.
I didn't upgrade battery packs. I may however buy and extra battery just to have two.
If you keep your kidneys warm, I think your upper torso will be warm.
If I had to do it all over again, I would probably go with just the wrap simply due to having less bulk when layering.