I can’t make a recommendation because I don’t have visibility to your entire app.
Ask your HS GC what they think, if you haven’t already.
Also look for guidance from UVA during a virtual or in-person admissions session (do this for each school). You can also reach out directly to your AO and ask them for guidance. Many will recommend what you do.
Good luck.