I agree with your list and thoughts there...
I would add: One more RB, in the draft, to back up Swift, specifically.
I would say that it's not critical but only slightly less than critical because I. do. not. trust. Swift's. availability.
Also: Backup QB. Short-term would be picking up a FA. And maybe that's enough. But if Holmes/ Campbell draft a QB in the first 3 rounds then I am assuming they believe in the pick enough to become at the very least a long(er) term solution as backup QB, and possibly better than that. If they don't draft one, it's still an (important) need... but it's not critical draft-wise... Just an extra 2 cents here...