That would be my choice, too. Dropping orchestra or another enjoyable elective to double up on math for no better reason than to get to calc quicker seems odd. If there were no enjoyable electives, maybe.