Jon Sharp

So I traded some work for an Onkyo TX-SR393 and 2 klipsh R51M's and a Sony SSCS8 center channel. I also recently bought a house that I set up my home theater in my living room 16 x 21 with vaulted ceilings, so probably not ideal. Listening to this setup I really liked the Klipsch speaker's so I went out and purchased 2 R-620F's and got a great deal on 2 used R-120sw's and moved the R51M's to my surround. However I am really struggling with calibrating the setup in this area and I don't know what I need to do next. So my question is should I just upgrade my center and my receiver or should I focus on calibration and placement? I made my purchases without any research and now I feel like I should have had a plan in mind but on the other hand I am new to this. I get things set where I like them on certain movies and then other movies I feel like its off balance and then music varies so much, is this normal?