1. Yes, you should avoid combining "old" and "new" credits based on my reading of the rules, but I have no direct experience with it. Note that cancellation of something based on old credit will give you credit that expires.
2. Yes, in the new system the flight credit expiration date is calculated from the day of purchase, not the day of cancellation.