Physics-Guided Solutions to Dispersion in Density-Functional Theory