Looks to be like you`re good to go with what you`ve got!
Don`t get all hung up with upgrading - you`ve got some excellent components there and some of that I`d rather have myself rather than being forced into a 10 speed system because everything else is being discontinued.