Well, sadly, it looks like this frame may have to be moved on.
I got the opportunity to buy one of my 'unicorns' on Monday, and i pulled the trigger. The XT kit and certainly my Z2's will be swapping to that bike.
I just don't have room for 2 retros right now. If anyone is interested let me know.