Drag-based CME modeling with heliospheric images incorporating frontal deformation: ELEvoHI 2.0