Shouldn't rebid 2d on a 5 bagger. Why not 2c, if it's going to bid over 1nt? If South doesn't double, but passes instead, North bids 2c; the double shouldn't really change that.
Not sure if 1nt by west is the right call either, my tendency is to just pass these since partner might be light and it's easy to be outgunned.

Help
