You don't want to include sampling gear in your calculations. It should be light enough that it doesn't matter that much (tape measures and quadrats), or heavy enough that you use (or at least have access to) a lift bag (Hammers, chisles, pneumatic tools, etc). Plus you can always drop it if needed. I always tell my dive buddies and fellow researchers that if they seem me with my camera dangling from its tether, I need help. It means I have decided that whatever issue I'm dealing with is more important than a $15k camera.
Rescuing an overweighted diver requires ditching weights or rethinking your system (team, equipment, procedures, etc). Dual bladder wings are sometimes the best sub-optimal option.
The issue isn't that your approach is too cautious, it is that you being too cautious in your thinking is making you less safe.
Appropriately sized tanks/wing combo and a drysuit sound like what you need honestly. Doing working dives to 60m on air with not ideal equipment sounds like a terrible place to be. You should be having some safety talks with your team/PI/DSO. As a DSO, I would never approve that as a plan.