Ok I called Freedom and fixed a few things, setup a PIN and also corrected my email which the guy at the store entered incorrectly.He said he will try the port in again and I should get another text to confirm, haven't got anything yet.
I have my Freedom SIM in the new phone but has a new number, the Public SIM is still in the old phone.He said eventually the old phone should lose service and the new phone will get my number.