It sounds like you have been using the cash basis, so you are not liable for tax until the year you are paid. But it starts on 6 April, not 5th! As you haven't issued an invoice, it isn't even a bad debt yet.
I appreciate you wanting to do things by the book. I agree, and wish everyone did...