I do not think you need to change a lot. I would try a 13 3/4in. 21 pitch first. The diameter is pretty small on your 21.
“The world will not be destroyed by those who do evil, but by those who watch them without doing anything” GOD IS GOOD