Freesat or Freeview?

[SpunkyMonkey]

I've currently got Sky+, and am looking to replace it with an HD PVR with no monthly subscriptions (almost certainly a HUMAX box). Ideally I would get a SKY-HD box and get freesat-from-sky, however I hate the idea of giving Sky £10 every month for the service of "not deliberately disabling my PVR".
I know that right now freesat has two HD channels (BBC and ITV via red button) whereas freeview has none, but I'm assuming that when the analogue channels are turned off then HD will come to freeview.
Is the channel lineup on freeview better than freesat?
Which one would people suggest I go for?
Apologies if this has been done to death in the past!

[SpunkyMonkey]

Ok, thanks for the advice- freesat it is. I just wish there was one pvr that had both freesat and freeview tuners!