I think you should do it now, no question. The new .5% fee is pure loss to you when it kicks in.
The bigger question is if you should accept a higher rate to avoid the $2400 cost you mention.
I calculated the breakeven on paying the fee v higher rate is about 6 years most of the time, and here I am doing a refi 8, 6, and 3 year into each of my mortgages, so it didn’t matter overall.