Those are great details you left out. So many factors to consider…more than just 15% & 1360.
I’d take both ACT and SAT (again). Sounds like you’ve got everything else ready to go. Make sure your tour of A&M is ‘official’-you sign up/register, not just show up and walk around.
Good luck!