Your existing surround spk setup, places them too close to each other, defeating their purpose of a proper surround sound field.
Your new setup is more suitable, keep both of them at the same height facing each other and parallel to each other, like you have depicted(both end of couch).
Also you might need to play a little with the surround spk delay settings, remember 1ms = 1'6" appx distance. Keep the delay so that the logical distance makes the spks appear slightly behind you.