Over Christmas, I talked to a relative that is in business with her husband and in a high income tax bracket.  The husband is nearing retirement and neither had heard anything about the OAS clawback.  My advice, consult a tax advisor soonest.
This 2017 year the TFSA total allowable investment ceiling will rise to $52K by the increase of $5,500 - a nice even amount.