The only suggestion I have is to add a center speaker. It's an EXTREMELY important part of any home theater, and it carries a heavy load during movies. The front 3 speakers are vital, and in no way to you ever want TV speakers taking center stage.
The center speaker is critical for movies. If you dont have one, it will complete screw up your YPAO configuration and ruin the surround effects, and in no way will the TV speakers do their job like a real center speaker. You need a center speaker that blends together seamlessly with your fronts. As for your budget, I see nothing wrong with your choices. Whatever you do, get the matching center that goes with your fronts. It's a must!!!
I cant stress this enough..... The Center speaker is a REALLY IMPORTANT part of any HT.
my 2 cents