You are right, nice catch.
The weapon idea to me, is a bit flimsy, I don't see how a little stick could become a weapon, unless you fluff up the ability to use the magical energy therein, but that, to me, would cost charges...just not what I wanted to do with the class....
However, I do like the Warlock idea...that is awesome.