Dispensationalism accomplishes all of this perfectly.