RE:More TFSA money
You possibly should have transferred the shares from your margin account to your TFSA (or your RRSP if you have room). It is still a "deemed" sale thus taxable but puts them in a tax free zone.
Future withdrawals from the RRSP(RIF) will be taxable though. Moving them to your TFSA is the preferred option although still taxable as a "deemed" sale. And then buying additional in your TFSA assuming you have room.
Pretty tough to avoid a tax on the existing shares one way or another. This is just a novice opinion -- not advice by the way.