If you're going to change the stock on the Ember, what about getting a cheaper SS Lite, sell barrel and stock, and rebarrel with pre-fit of your choice? You'd still come out around the price of the Ember for the barreled action you end up with, and then can get whatever stock you would have if you got the Ember. That way you also have control of the barrel profile and length to address your rigidity concerns (IMO D16 is perfectly fine).