I'm not sure if anyone else has said this, but here is my solution: Simply make an IE style search engine picker. When you open Safari for the first time after upgrading to 4.0, it will ask you to choose your default search engine from a list. 90% will pick to continue using Google, and the rest can do whatever else they want. Solved!