Yes and no, to both.
I also need to step up my training; I need a lot more “time in the saddle” to get used to the riding position, the feel of the bike, and of course strength/endurance training for the long haul. I need the ability to be on the bike multiple days in a row without getting weird minor aches (that will compound over days.) I need to install my panniers and load them up, then go on a few rides. That’s going to be interesting.