So updating the code for selecting a stock item hasn't been that difficult. Each issue that arises has been to code out a solution. I can code out a PR to slowly integrate my changes back into Solidus if this might be of interest to anyone. I understand if this isn't wanted in core solidus.