Kelly -
I seem to recall that you do a lot of run&gun type turkey hunting - if so, make sure you carefully consider the weights of a 12ga semiauto (I'm just assuming you're looking at 12ga because of the waterfowl comment). I know quite a few older guys who have moved from 12ga pump to 20ga semiautos for turkeys, and they say even that 1/2 pound and reduced recoil makes a big difference. However, I'm not sure I'd want a 20ga for Canadian geese.
A newer stock may be your best option - or have you considered a new pump? If you like the SBE then maybe a new Nova is the next step...