I feel like its more likely All for One is just using Shigaraki. I can't decide if AFO picked up Shigaraki just to mess with All Might because he knew who he was, or it ended up being an amazingly horrible coincidence. I guess the former makes more sense but it just makes him too dang smart...