In 2017 I contributed $20K into my RSP. In Feb.'18 I withdrew this amount under the HBP. I have found out that I was only allowed to contribute $8k. What do I do?

CRA said to put the $12,000 back into RSP as a repayment of the HBP and then withdraw the $12,000 from RSP and file T746 form.

My accountant will only deduct the $8000 from my income.  I don't want it to affect my HBP.