Your math sounds about right, but that seems more than ample IMO. Some of the Tasha's Feats are definitely not coming over (Artificer Initiate and Gunner, probavly, considering there is no Artificer and guns are juat standard issue equipment now). That provides a large number of options for...