I wasn't entirely sure on how the spells learned progression should go, so, yeah, I'd say both.

If you're unsatisfied with that, you can always just use the sorcerer's spells learned instead.