I'd take a look at the new DA Di2 (9100) group when it comes out. My bet is that the bar end junction box is backwards compatible. If you have a bar with internal routing and a new wiring harness for that part, should work. Also includes a charging port - really nice idea.
J.