It’s time for the xp and the kickoff to go away anyway. Or keep the xp and make it a non-kicking attempt.
I like the idea of making it so that if you convert a two-point conversion, you get the ball back.