All warts are caused by HPV. Some effect other areas of the body, but they are not the same type that will cause warts on your genitals. Plus, like fourmore123 stated, if you have a wart on your hand, touch yourself (or a partner) down there, you will not get genital warts from that.
If you haven't read it over already, this site's HPV info is informative:http://www.ashastd.org/hpv/hpv_learn.cfm
Also, it's always possible that you got HPV from your current partner. She could have been a carrier without symptoms until now. Many people have the virus without symptoms. Which makes them unaware, and they pass it along to their partners. Unless you had seen warts prior to meeting/being with her in any sexual way. Not saying she did, but it is a possibility. Then again, as you stated, you may have contracted it yourself from a prior experience. One of the many sucky things about this virus is it's hard to pinpoint and catch.
Fingers crossed for your partner. Goodluck to you as well.