3 years, wow! Congratulations! Sounds like a pretty stable cash flow to me.
Can you not just incorporate an escalating rate clause in your tenancy agreement? Example, if his term starts on July 1st, 2008, and ends on July 1st, 2011, you could do the following:
*HYPOTHETICAL DOLLAR VALUES*...