Yes, what you clarified above is correct.
Regarding the old loan, you should use the ending date, presumably March 30.
Regarding the new loan, you should use the first payment date, which you stated was in May.
@mh0520
