Thanks for the advice, I will probably end up getting the RC-62 II, but I may have to move my mount ( more holes in the wall). I have no idea yet what type of RF's I would upgrade to, but I doubt I will go bigger than the RF-62 II's. Correction, I meant to put RC-52 II and RS-42 II.
I ended up ordering the Onkyo TX-SR707 because there was only 1 left in stock. There are only 2 left on the BIC V1220 so I may be ordering that soon.
I added a picture of my planned setup, but I was wondering if I should put my sub in the front corner or in one of the back corners. The sofa is against the wall, so I may have to play around with the location of the surrounds. The room is 14 x 14 x 11 with wood floors and drywall, but the rug should help a little with acoustics.