I'm pretty sure you still can't root with an official 2.1 install.
If you're gonna root, do it now. There are lots of ROMs based on 2.1, including one based on the official 2.1 update. You need to already be rooted to use them however.
If you get the OTA 2.1 update, you are going to have to go back to 2.0.1 before you root anyway so you'll just be adding unnecessary time to the process.