Very nice tank and Great pics.
IMO- its a Green Terrior, and you had mentioned before that you hope it dosn't screw things up later down the road.. Well... Its 50/50..
You should be alright, I used to have a GT that was with more even more aggressive fish, but i got them all at the same time, and they were fine with eachother. So, i think as long as they grow up together, then they should be fine.... But thats just my experince....