Gaaaasp!I have exactly the same issues, but a bit worse due to using 1.6x crop sensors
What I did the past 2 summers was using both M + MP-E and 100D + EF-S 60mm for close up work. Start with the EF-S 60mm to sneak up on solitary bees building their nests and use the MP-E to camp out.
And you can go from this:View attachment 183291
to the next picture without too much trouble:
View attachment 183292