I think Calderon will be with the Raptors unless part of trade for Iiguodala.
It seems to me over the past 2-3 years the Raptors even with 2 good point guards still were struggling at that position because of injuries. So it is never a good idea to be too thin at this position.