Home Switcher / Launcher Pro / 2.2

Anyone have this combo? Sice I installed 2.2, Switcher will set the default and I open LP, but the moment I hit the home button, even though I have set LP as default, the stock Froyo Launcher opens.

Now I PREFER the Stock Froyo Launcher with the 5 screens and new drawer, even though LP is GREAT! But I prefer to use stock when available.

However, I was hoping 2.2 would fix a VERY annoying issue--the Dissapearing Icon Syndrome cause when the Launcher is forced to restart. I noticed this problem is even WORSE in 2.2 so I wanted to try Launcher Pro for a while (I doubt that will change anything).