If bailout is pushing deco harder than you would normally like to do, then why not carry more bailout? I had a discussion with a mate on Friday that largely revolved around don't make a dive plan fit the gear you have, make the gear you have fit the dive plan. This was for a dive with a set bottom time and set depth. That for me would include bailout (or obviously in this case cutting bottom time or depth). I'm not very comfortable with the idea of bailing out and knowing I was about to run an agressive profile when I did it.
The numbers don't look all that bad to me. I'd probably tweak here and there, but it's not more than a few minutes from one stop and onto another. But then you and I don't have to worry about adding in a few extra minutes anywhere really, the units save that hassle.
I run the plan using setpoint then run O2 RB as a safety factor. Makes a lot of sense. In this case I'd be in the water an extra 8 minutes, which is fine by me. Or I could go for the Juz standard do whatever plan you were going to do, then add 10 minutes at 6. Works for him, works for me. Unless I really need a wee.
Digs.