Intel laptop line of CPUs only accept 16gb [1], so there's no reason to no max it out from the start if you need it, really. The battery, unless you are confortable with buying chinese parts, you should only be buying a replacement for Apple, so I don't see the problem with having them replace it for you. Granted, this is easier having Apple stores close by.
And SSD hardly ever fail, compared to old HDDs at least, so unless you want to increase capacity, there in't much need to compared with before, and Apple gives you the option to buy the biggest SSD you can put in there from the beginning.
Edit: [1] I believe since Skylake, they support more than 16gb! I thought that was only with the new Xeons for laptops.