Ditto on that, robtattoo. I use 25 degrees on my hunting knives, too.
But the angle you use is really personal preference.
The steeper angle makes for a bit longer lasting edge, IMOHO.
The Lansky diamond stones really can get your blades trued up in a hurry. I start with the extra coarse stone on badly abused blades; coarse to start on blades where I am changing the blade edge angel for the first time. Work on down to the fine diamond stone.
And if I reaally want to be pedantic, I will finish polish the edge on an 8000x water stone. Looks impressive, and It is scarey sharp, but I believe the really fine edge you get doesn't last very long.
"Nothing will get you cut badly quicker than a dull knife" (Something my dear departed Grandfather used to tell us.)