Yes I would. Even with Pedro's recent physical problems, I believe he has much more heart and desire. And, I think he is smarter. Neither player has their best stuff at this stage of their careers. That's why I'd give the ball to Pedro. More desire and character. Both have lousy hair, by the way.
I feel I have to back-up what I said. I don't have numbers to help me here. Just my objective assessment based on what I've seen of both. Johnson has had the advantage of physical superiority, but Perdro has demonstrated an ability to compete AND dominate with far less physical strength (smaller and slight of build). Just watching Pedro's efforts you could tell that he was more motivated to excel than Johnson. Heart can't be assessed by some Sabermetric.
That's what I think, anyway.