^ If you're going to switch to an emerald, I'd definitely limit the amount of green fabric to accents...if you make an entire border out of it, I feel like it might overwhelm the pastels in the rest of the outfit.
I think part of the decision depends on how tall your bhaabi is. Several different contrasting colors in layers make you look short...so if she's less than 5'5"-5'6" I'd stay away from the broad green border, and bring the hemline of the shirt up several inches (at least so it hits at the top of the knee). If she's tall, your options are open. Personally, I think it would look better if green was just an accent though.
I have to say, I'm also not a fan of the Umar Sayeed. I like the skirt, but the top is too shiny for my taste.
She's basically 5'3" so I can see what you mean when you say the hop scotch of colours will make her short...I don't think she will appreciate that! Bringing the hemline up several inches might help to dispel the fact that she is a little on the short side?
I was never sure about the green...personally, I feel it would probably only work as an accent having considered all the possibilties...and boy there are so many!