Yeah lock 2.0 is terrible.
This is one of the currently annoying sense problems. If you put pattern lock you have to do 2 unlocks. On the droid it will only give you the pattern lock. problem with the droid is the lockscreen SUCKS. You cant put your own wallpaper on it separate from the regular and it has no music control so whenever you want to change songs etc you have to unlock and navigate to your player.
I found the best solution is to use locale with the .99 lockscreen plugin and then set it to bring up your pattern only when you are away from home or places where you feel fairly secure.