Can you post some pics?
I’m a big fan of ergonomics, aka Comfort Tetris.
Hard to recommend configurations without a current visual of what isn’t working.
Also, with regards to the computer, it depends on how you work. Is the computer acting as a recorder? Do you do DAW arranging/producing?
What percentage of your time is spent with hardware vs software? etc.