I agree, drapery panels in a rich fabric and jewel tone - looks like your ottomans are either a purple or red wine color? Use that for draperies, it'll be stunning. I love what you have so far :-)

I think you need to do two panels with valances...on either side of the fireplace. The panels would be closest to the wall and the valances would go completely from the wall to the fireplace. Sort of like framing the wall.

I would do panels on all windows except the fireplace. There I would do matching roman shades.

And please lower your art. With the odd shape of your fireplace, I'm not sure if it should go a few inches over the firebox, or a few inches over the shelf plane, but there needs to be more space above it than below it, for sure.

Your art might look good hung about 8" over your couch.

Your space is tight in both locations, which makes heavy paired treatments impractical. I suggest a very light treatment - gauze, cutwork, linen - to cover the windows entirely and be allowed to pool on the floor, and then layered over with a treatment of your choice - a train of rich fabric down the center of ea. panel ( and a third between windows in the dining room) looped tie-like or gathered midway, or alternately, beading or chain. Either would maintain uniformity, retain the light and add some serious punch to the windows.