yes, a 25k audio(log) will work for you. as described in the geofx article, the tapers of cheaper pots are not one continuous curve. they are broken into 3 curved segments, and vary from pot to pot. the military spec'd versions, such as the allesandro(PEC) pot, are the continuous curved. and should be the same pot to pot. they are also sealed so, no contamination can enter it. and lastly the rotation life is way may more and should last a long, long time.
as for the tone caps. keep in mind, jerry used military version potentiometers(RV4-Type J Linear). He also used Ceramic Disc capacitors for his tone caps. the material is the key here, as well as the value. a .022uF, as you have, is so close you probably would not hear the difference. but since you will most likely change the material to ceramic disc, why not just order the .02uf's?
Disclaimer: I make and sell Buffers. I also sometimes Modify, Build and sell preamps and amplifiers. My opinions are not intended to be sales pitches. I am a one man shop and prefer to spend time with my wife and family, i work full time on call and love to spend my spare time doing other things. I only make, modify or build things for those that seek them.