Transferring to S, and re-bidding 2 or 3N is not for me: IMO, this should show a balanced or semibalanced hand (5-3-3-2 or 5-4-2-2); I'd never anticipate a 5-5-2-1. I can understand passing a 2♠ rebid: if opener cannot super-accept, game is likely to be marginal. OTOH, I'd prefer to play 3any forcing up to 3♠ only (i.e., can show just an invitational, distributional hand). Opener would rebid 3♠ with a minimum and 2-3 spades; 3N, max and 2 spades, with stopper in the round suits; 4♠ max and 3 spades; 3♥ or 4♣ without stopper in the bid suit, 2 spades and max (obviously good fit in diamonds).