Hi
Going by the tone & tenor of both of you (you and your tenant), it is clear that your terms are good.
In order to maintain cordial relations, you may talk to him diplomatically and seek for vacating the premises and handover the same to you.
However, the T&C of your agreement will have certain bearing on the issue.
Peruse the same before taking a call. Your seeking of premises back should be in line with the T&C of Agreement.
The details shared by you under head "More Details" clearly shows that you have intimated to him about your intentions.
In reply to your query No.1 to 4, you make it clear in your notice that, by such date you demand him to vacate and handover the premises to you.
You need not create new agreement in the present context.
To keep your record clean and straight, you issue a notice to your tenant through your local Advocate, referring to your earlier communication also.
Further, your present notice shall be clear pertaining to your intentions of terminating the tenancy and also seeking the vacant possession of the same. The same shall be in line with the T&C of your agreement.
Your local Advocate will be able to give further details.
Good Luck.