The first pic looked about right to me. At the demos they have them right into the corner as far as possible and toed right in as far as they will go. It doesn't work, you get bass like a 1950s radiogram. Unless that is what you want I suppose.
Anyway first thing I would try is put the speakers back a bit and get rid of the toe in. Have them aiming straight ahead. That'll reduce the amount of high frequency you are getting directly. Should help, possibly quite a bit.
Rug/ tapestry thing on the wall behind you and the one behind the speaker is a good idea too, Then look at a bit of damping on the first reflection points on the walls either side of the speakers. That one is a bit more difficult to disguise as 'decor' though.
Cool room. Looks like it is California or somewhere like that.
Current Lash Up:
TEAC VRDS 701T > Sony TAE1000ESD > Krell KSA50S > JM Labs Focal Electra 926.