Shane wasn't even at 147 at the time. Tony was hiding in WBO land fighting the likes of Sebastian Lujuan and Manuel Gomez. I highly doubt Tony would have been more competitive. Baldomir can fire straight punches and doesn't have to be set to punch like Tony.
He didn't cherry pick Baldo, but Baldo did fall on his lap. he was fortunate to come around when there was an extremly weak welterweight champ but it was still the right fight to take.