Modified two-fluid model for superconductor surface impedance calculation