Upgrade Dilemma
Jerry VanOort
Yes, the PS3 decodes Dolby TrueHD and DTS-HD Master Audio lossless audio formats and sends them as PCM data via HDMI to your receiver, which can accept them in that format. If you have the original PS3, it cannot send Dolby TrueHD or DTS-HD bitstreams, but that's no problem, since the Yamaha AVR cannot decode them anyway. (The newer PS3 Slim can send Dolby TrueHD and DTS-HD bitstreams, but that doesn't matter in your case.) So I would definitely replace your surround speakers to match the Klipsch fronts, which is very important in order to maintain a consistent tonal character throughout the entire surround soundfield. Then, when your budget permits, upgrade the AVR; both models you mention are great choices.
If you have an A/V question, please send it to askhometheater@gmail.com.