One other note, I congratulate you on a different approach that I've only seen Clell use, the idea that Dumbledore kept Tom in that orphanage to make him the tool to defeat Grindlewald with and then tried the same approach to make Harry the tool to defeat Tom with. 'Twould be better just to do the bloody job himself.
Clell and I tend to think alike. He's one of my favorite authors.As for Dumbley/Tom, it's the only thing that makes sense. Tom found out what he was being groomed to be and said 'No thanks!' so Albie had to fight off Grindelwald himself.
When Tommy came back as the big, bad, Harry became Tommy boy, Mk II.
'Twould be better just to do the bloody job himself.
Albus never does things personally. He always uses proxies. It's how he can affect innocence and purity for the unwashed masses.