So bad news. Seems the charging circut blew on the Riot. It could have blown since I got it and never noticed it, it could be the result of the 18670 having a lower voltage than average...im getting a store bought one of those just in case, or it could be that I was a fucking retard and throwing 6v at the device was just too much for it. I think the last hypothesis is most likely correct and if so now I need to source parts. Hopefully those who also own the unit (like 3 people) would be happy to show me their charging circut so I can compare and contrast and get a good idea what I need to buy.