I'm not having any choppiness on the stock browser, if anything it is slightly faster.
When I upgraded to Froyo, it fubared my Swype application, and I had to reinstall. Directions on reinstalling can be found by googling, but in short you uninstall Swype AND THE SWYPE INSTALLER, then delete the files from the Downloads folder on your SD card. Then you go back to the Swype website (found in your original email from swype) and redownload the installer. Install it, make sure "swype" is checked as an input option in menus under keyboards and langauges, and you should be able to swype again. If it doesn't work initially, try powering off your phone (or removing the battery). I had to do that twice before Swype started working again, but two restarts fixed things.