SM Jiraiya has unlimited chakra so Samehada's chakra-absorbing ability is a nonfactor. But yeah, I'm going to have to say Jiraiya because he is very, very versatile
Dang dude, looks like we disagree for once. Kisame only has water. Jiraiya has fire release, summonings, genjutsu, strength, tactics, sensory skills, speed and basically unlimited chakra while in SM. Kisame has tailed beast level chakra so it'll be a long fight though