Glock1 you are really moving in the right direction! Your plans appear solid, moved a couple of firearms to upgrade, and see the need to prep! After getting your "battery" together, maybe a generator, some food planning, some plastic tubs to organize, and rotate stock. Study some bushcraft skills, first aid, plant a garden.
Have some fun, get a few others on track.