It makes no sense to take Principles if you already took CS A. It’s like taking Physics C then self studying for Physics 1. Colleges don’t care about # of APs anyway, they just want you take the hardest classes already available to you.
AB Calc will not keep you out. It’s fine. Worry about taking rigorous classes across all 5 core areas instead.