Looked at your old room set up, it looked like it might sound great. I'm not so confident about your new room set up. I suspect that your issues might be helped by moving your speakers forward or backward to find the best balanced location so your bass response is smooth. Maybe involving moving your subs as well. In that respect I would probably set up my main speakers first without the subs and after I found their best location incorporate the subs. You may find totally different locations that will work well if not better. Your photos make your set up seem a bit more congested (than your prior room). You might move your speakers a tad closer to the side walls (not such a big deal with panel speakers),and as rvpiano suggests, reduce their toe-in. I cannot tell from your photos but I assume you have your listening chair triangulated with your speakers. You might try moving your chair(?) backward and forward a bit. I note your present room is more problematic because of its dimensions. You might (if you can or if you haven't) consider firing them down the long dimension of the room.
Good luck. :-)

