Regrouping from defeat: Android SDK next steps

I've given up on using the Freebroid port of the Android SDK. I don't know enough about git in order to ensure that I can make the necessary changes in my local git tree and be able to merge in updates from the master Android repo on kernel.org. Once I figure this part out, I think I'm going to start my own "fork" of the SDK. The next question is then whether I want to continue to use FreeBSD, or go back to OpenBSD, which in my opinion has better hardware support on my Acer but doesn't have a prebuilt package for Eclipse. Either way I'm content to use git and perhaps even standardize on it as my SCM of choice. It seems far more robust than other products though I have no real useful experience developing with any of them.