With that build, I would consider a 2.08 valve.
That combo sounds like the kind of crud I deal with all the time! Makes you wonder what the heck they were thinking???????

What top angle do you use?