Added an edit above: This line of inquiry is in the context of just the core rules (no supplement feats, Improved Toughness, PHB2 retraining, etc.)
My suggestions in the OP were for the entirety of the effect of Toughness (e.g. #1 -- +2hp/level; not 3 +2hp/level). I hadn't thought about...