Gap period income got axed a few years back, maybe with PPA if forgret whic actual law did away with gap period income.
Yes, though at this point I'd probably wait until the deposit is actually made to do the refund and 5330. I mean what do you do if the client never makes the matching deposit? Others may have a different view.