I used Nokia Suite just yesterday and the maps were still there.

Regarding the EULA and your N900 calling home, just uninstall cherry before you put a SIM card in. You will need to install rootsh first and use the command line. Due to the weird Nokia dependencies, uninstalling cherry will force the uninstallation of the Fremantle metapackage which means you will have to do all your updates manually so obviously this solution may not be for everyone.