Use Canadian tax rules (average cost) and transfer shares in one block, instead of converting every single old share into the new ones.
