MSP430G2553: Help with switching timer capture on both edges; current design occasionally reverses pattern

#include <msp430.h> 
#define BTN_KEY BIT5   //attach key to P2_5 TA1.2
#define BUZZER  BIT6  // Buzzer -> P2_6
void PortsInit(void);
void InitBuzzer(void);
volatile char edge = 0; //used to toggle CCR2 edge detect

int main(void)
{
	WDTCTL = WDTPW | WDTHOLD;	// stop watchdog timer
    PortsInit();
    P2DIR &= ~BTN_KEY; //Set Btn as input
    P2SEL = BTN_KEY; //Set Btn for Timer1_A CCI1A capture
    InitBuzzer();
    //Set up Timer1A
    TA1CTL = MC_2 | ID_3 | TASSEL_2 | TACLR;// | TAIE;
    // capture on falling edge, CCI1A input, synchronous cap, capture mode, ints enabled
    TA1CCTL2 = CM_2 | CCIS_1 | SCS | CAP | CCIE;
    __enable_interrupt();
    for ( ; ; ){
        // do nothing
    }
	return 0;
}
#pragma vector = WDT_VECTOR
__interrupt void WDT_ISR(void){ // use to debounce falling and rising
    IE1 &= ~WDTIE; // disable WDT interrupt
    IFG1 &= ~WDTIFG; // clear flag
    WDTCTL = WDTPW + WDTHOLD; // put WDT back in hold state
    TA1CCTL2 &= ~CCIFG; // clear the CCRO flag
    TA1CCTL2 &= ~COV; // reset COV bit if it was set
    TA1CCTL2 |= CCIE; //enable interrupts
}
#pragma vector = TIMER1_A1_VECTOR
__interrupt void TIMER1_A1_ISR (void){
    switch (__even_in_range(TA1IV, 10)){
    case 0:
        break;
    case TA1IV_TACCR2:
        //grab value of TA1CCR2 here
        TA1CCTL2 &= ~CCIE;    // disable further CCIE interrupts
        TA1CTL |= MC_0; // stop timer
        if((P2IN & BTN_KEY) == 0){ // should be here at beginning of down pulse
            edge = 1;
            TA0CTL |= MC_1; // start tone
            P2SEL |= BUZZER;
            TA1CCTL2 |= CM_1;  // trigger on rising edge
        }else{ // Should be here after down pulse finished
            edge = 0;
            TA0CTL |= MC_0; // end tone
            P2SEL &= ~BUZZER;
            TA1CCTL2 |= CM_2;  // trigger on falling edge, enable interrupts
        }
        TA1CTL |= MC_2; // restart timer
        IE1 |= WDTIE; // enable watchdog interrupt
        WDTCTL = WDT_MDLY_32;  // start and set WDT (watch dog timer) 32ms interval
        break;
    case TA1IV_TAIFG:
        break;
    default:
        for (;;){
            //Should not be possible
        }
    }
}
void PortsInit(void){
    P1OUT = 0;
    P1DIR = 0xFF;
    P2OUT = 0;
    P2DIR = 0xFF;
    P3OUT = 0;
    P3DIR = 0xFF;
}
void InitBuzzer(void){
    P2DIR |= BUZZER;
    TA0CCR0 = 0x8ec;  // period
    TA0CCR1 = 0x476;  // period/2
    TA0CTL = TACLR + TASSEL_2 +  MC_1;     // Timer -> SMCLK, Up Mode, Clear
    TA0CCTL1 |= OUTMOD_7;                  // Output mode for TA0.1 Reset/Set
}