No matter what you do it seems you can't change the order of the shortcuts. Since I don't want to take stuff out of Libraries the solution I used was to only show Favorites and Computer. Favorites only has 3 items. That way I can leave both Favorites and Computer expanded(only as far a drives, not current location) and everything shows without scrolling.
What would make it nicer would be the ability to control click on a drive and have it open in a new window. That's for another day.