I have little interest in playing in clubs and rebidding D is secnd best imho, 3S is just fine. 4S could easily make facing a helpful diamond card in partners hand. There is nothing to stop partner from bidding 3N either when he holds a hand that looks like 10xxx xx Qx AJ10x, or pop that Q into either major suit and game has play placing partner in a position to make a good decision to bid on or not.