Dont listen to all these critics. You definitely improved your score because the first time, you had more of a range and the second time around you were generally more consistent. The only thing that "hurt" you the second time was the OC section. If that had been in the 19-20 range or even a 21 like your first exam, then your TS and AA would have been well above the average for applying and even accepted students for most schools. So congrats on that!👍
In terms of your question, I don't know the "right" answer, but I'd be willing to bet money that they look at an exam holistically. Some people on SDN have reported that they look at only one test, in which case you're fine. If they look at both, then its even better for you because you showed improvement in most subjects. So overall, congratulations, now go relax and enjoy your weekend!