Here's my take on your bedroom given your options.
It's your option 1 but I moved the closet into the next room. That's your post in red. You loose a little space in the living room but I think it works better. The extra space in the wall could be used as a linen closet or some sort of built in cabinet or bookshelf.
Queen size bed with headboard and side table. Plus a dresses, L shaped desk and bookshelf seem to fit and work nicely. A wall light on a three way by the bed would be a nice addition as well.