Refactor wrapped scan plans so they are flatter

[oliwenmandiamond]

Fixes #ISSUE

Instructions to reviewer on how to test:

1. Do thing x
2. Confirm thing y happens

Checks for reviewer

• Would the PR title make sense to a scientist on a set of release notes
• If a new device has been added does it follow the standards
• If changing the API for a pre-existing device, ensure that any beamlines using this device have updated their Bluesky plans accordingly
• Have the connection tests for the relevant beamline(s) been run via dodal connect ${BEAMLINE}

[codecov]

Codecov Report

❌ Patch coverage is 93.42105% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 99.07%. Comparing base (454f60a) to head (9ad324a).
⚠️ Report is 3 commits behind head on main.

Files with missing lines	Patch %	Lines
src/dodal/plans/wrapped.py	93.42%	5 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #2050      +/-   ##
==========================================
- Coverage   99.11%   99.07%   -0.04%     
==========================================
  Files         327      327              
  Lines       12803    12798       -5     
==========================================
- Hits        12690    12680      -10     
- Misses        113      118       +5     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.