I'm in the same boat. I think Apple should consider adopting that bullshit "Don't be evil" mantra.
Apple make good laptop hardware though. Here's a better idea: keep your existing Mac, but buy an HTC Desire as your next phone.
You get a lot of features the iPhone doesn't have (pictures for your contacts, social network integration, streaming, no sync requirement, a faster CPU) and stick it to Apple at the same time.
Unfortunately at this point I feel that I'm obligated not to buy Apple products. Walk with your feet, as the saying goes. Believing in patent reform can be damn inconvenient sometimes.