An improved asymptotic matching technique to trace the wave amplitude of rays across singularities: Application to lower-hybrid wave propagation in tokamaks