Help me improve my current speaker setup

[Tcrumpen]

Right now my speaker setup is a bit janky

 

I have a home theater system with a built in bluray player which due to it being a budget system only has 1 input (Optical) and 1 output (HDMI)

 

My current setup is this

 

HDMI Out into one of my TVs HDMI inputs for watching blurays etc.

Optical cable from my computer's motherboard into a three way optical switch which in turn is then connected to the optical in of my sound system

Optical cable from my TV into my optical switch which as above is therefore connected to the input of my sound system

 

My TV only has two HDMI inputs and because i use my TV also as my monitor (not enough physical space for a monitor and separate TV) i'm currently using both of the HDMI inputs

 

Now i switch between the sound from my TV and the sound from my computer by changing the port of my optical switch; it works but it is obviously rather clunky

 

I'm trying to work out a way of making this setup 'cleaner' without re buying a home theater setup

 

I made a topic on this previously however that topic is old and following the rules of the forum i'm opening another topic

 

Can someone suggest a way of making this setup easier?