Simplest, easiest solution:
Require the two-point conversion try from the two. Give the option of a single extra point with the line of scrimmage at the 30, making it around a 47 yard kick.
Doable, but no longer automatic.
Simple. Easy. No subtraction, and exciting.
I'll take payment in a check, please.