If the Treasury Department should not remove Hamilton from the $10 bill, what should they do? The answer is fairly simple: Replace Andrew Jackson on the $20 bill.
A rematch is one of those things that will always be there when you remove a champion, and it's something you definitely need to give them - that chance for a rematch. That's the only way to do it.