Not if you're looking for a long-term solution. Face it, whoever is in that role if the Republicans take the House in 2022 will move up to House Whip. McCarthy will be Speaker and Scalia will be majority leader. Is Stefanik the person for that role, given her moderate tendencies?
Doodle - that is not going to look good. Digging up his corpse is bad enough but to trot him out there...