first off, an vacuum leak would cause soft shifts not hard ones.
it could be the kickdown switch still. just because it seems ok dosen't mean it is.
disconnect it, and see if it's working. if you disconnect it completely, drive and see if it shifts correctly.