I did about the same thing but I put down my pipes at 16 and didn't pick them up again untill las October. I'm 45 years now and I couldn't even read music anymore. I hooked up with the Wake and District Pipes and Drums in Raleigh NC where I live and using the John Cairns instructions I am now a playing member of the band. I recomend the Cairns solutions because it is easy to understand and there are CD's that go along with it.
Here's a link.
http://www.bagpipesolutions.com/