Just to chime in on the potty training: if he's interested, why not go for it?

My elder was day trained by 22-23 mo (very sound sleeper once out, so nights took longer), and close-in-age younger sib self-trained by 21-22 mo (day and night) from watching elder. Younger probably would've been done even earlier but for falling off a toilet at 19 mo, which understandably set things back a bit. (None of this was pushed by me; I followed their leads.)

Putting myself in your kid's shoes: if he is orderly by nature and wants to be able to control things in his life, this seems like an easy give and a win both for him and for you.