Man this is a Sophie choice for me. I love pact magic but hate the “go through the MM” wild shape.I think the canary will be what wild shape looks like. If it's 2014 with errata, pact magic lives. If it's templates redone, pact magic is probably toast.
(Obviously, it's possible to split the difference, but the whole "sparks joy" test doesn't fill me with confidence either will get heavy revision).