You might be able to make some slide extensions out of wood or metal to narrow up the windrow for the baler too. 

I think you will do a better job harvesting the wheat by taking a full swath.  You could either mow the stubble after combining and and rake it into windrows or cut it  high with the combine and squeeze the windrow down.