I definitely think they should rearrage the vocals to fit Jon's voice better now. Like on Prayer, we sing the high notes for him.

I don't want songs to be eliminated entirely because as times goes on, Jon's voice is changing and he can't sing them the same way anymore. Richie and Dave can do the high harmony, let Jon do the low harmony...whatever. There are ways to change around the vocals so that the song still sounds great, even if it's a little different from the original.