Virgin to Orange, What to do?

Jimble

Help!
My contract is up with Virgin.
I spend about 30 quid a month, I already have Wanadoo Broadband, so to switch to Orange seems to make sense. I wanted to wait for a P990i, but am fed up with this idea, so what is the best offer phone/free gift (no cashback) that will mean I get free broadband. This will save me 17.99 per month.
Thanks in advance for any help.

Bathsheba

I recently changed my Orange PAYG to a £30 per month contract, which included free Broadband Plus (I also had Wanadoo previously), plus free evening and weekend UK landline calls from my landline. Also includes insurance.
The changeover worked very smoothly. The contract I'm on is called Racoon 30, with oodles of free extra text messages, which I tend to use more than actual phone calls.
No problems so far!
I looked at the Orange website, got very confused by all the different combinations, so went into the Orange shop and sorted it out. Although the website claims to offer the best deals, I'm not sure that's necessarily the case, and I'm quite happy with what I've got.

Bathsheba

Forgot to say, the contract came with a Nokia 6280, which cost me £30. Great phone.