BC- I converted my XT-17000 as you have done and I just don't use it because of the battery/wire setup - pain in the butt actually!
I'm thinking I'll go back to a battery pack ML sell them for around $70-75 last time I looked. Battery World put em together also, but they were dearer than 75...