To disable all internet data, just uncheck "Data enabled", all options are normal Froyo settings.
Connect on demand should work, if you disable "Auto-sync" under Settings / Accounts & synchronisation (maybe also "Backgroud data", be careful, some programs need background data) and also disable automatic Market updates. Still, if you leave "Data enabled" checked, some programs (weather widgets, Facebook client) can try to connect.