There was a fairly recent discussion of tumble here that had some excellent proposed rules.
For opposed diplomacy checks, I prefer Rich Burlew's system because it changes the purpose of diplomacy to something I find more palatable. It's also opposed. I would just make one small change to it - if the proposition is just too crazy, the NPC can say no without rolling.