Yup, in fact the latest change was I don't have to pay it back at all.. I'll almost definitely get both at that time if not sooner, I have a great media player setup now, though it lacks X.264/H.264, which I will want to support in the future.
Yo, did you know if you bought your home in the beginning of 2009 you can get $8000 on form 5405 and you don't have to pay it back for three years!! Just letting you know dude! Btw, the PS3 is awesome, even if you just use it as a very cheap media server. I have mine connected to my NAS so I can play back all of my stored HD Movies/Music/Photos on my HDTV.