Should I redo my SAT or my SAT Subject Tests?

Hi, international student looking to apply to UC Berkeley and UCLA. My SAT score is alright, I guess–2160, but since I am an international student, I don’t think it’s competitive enough for UC. My SAT II scores are a major ouch (680 Literature 690 Math Level 2), but since they’re not required I’m not reporting them. However, since SAT II scores are recommended, I’m considering retaking those and reporting my 2160 score (I am applying to Letters and Science and Arts and Humanities by the way). But at the same time I really feel that I should take the new SAT instead and hopefully get a really strong score from that this time and just not report my SAT II. Help?