[WBFAir]

I know this may not be exactly what you are looking for fditty but I use Wifi pretty much all the time too but I still have a data connection with Page Plus if I really need it so what I do is I have a little free program called No Data that is a nice simple interface that completely turns the data connection on or off.

What I'm thinking you could do is just leave the data connection off which would force the Wifi for all that stuff you are talking about, then when you know you not going to be in a Wifi area and you need something you could turn it back on.

Pretty much if you put it in your shortcut menu it is a simple process.

Hope it helps.

Edit: although it looks like that above program does essentially the same thing but you might still want to check it out as I think it may have a few less steps.