^^ Agree. He'll be almost twice as old when you go back to work, and his routine will be different. If his feeding times still don't fall quite right for pick up and bedtime would you mind him snacking a bit? So instead of full bottles he might take a few ounces just before he leaves daycare, a few more when you get home, and then his bedtime feed later? Eating right before he leaves should help with napping in the car too, there's nothing worse than a hungry crying baby while you're driving and can't feed them!
It's a tough transition. Not sure if you were asking about feeding specifically or more general advice, but I would say always get everything ready the night before! I went back to work p/t when dd was 8 weeks old, and I found it hard enough getting my head in a work place and trying not to worry about dd that it made it much easier to just pick up and go in the morning without thinking about what I needed to take.
Good luck when you go back!