I would say for your combination, stay with the 2800. It doesn't have much more duration on either intake or exhaust, but more lift. This will give you some additional power without sacrificing idle quality and off idle throttle response.

I would also go one further since you are in process of rebuilding anyway and elongate the pushrod holes to run 1.65 rockers. This will again add more valve lift. The additional lift will help with those small valves on the intake.