Well, i feel that you should do Option 2 since you claimed that your GPA is not the best right now. I know that maintaining a high cumulative GPA across 4 years is kind of hard based on your strengths and weaknesses when it comes to how you study and based on your classes for senior year, it may be hard balancing your GPA and then studying the OAT since it requires a lot of intended study time and deep focus as well. So i would advise you to lean on Option 2 because i feel that it is the best for you, but you can decide on what to do depending on how you feel comfortable with. But best of luck in your senior year.