I'd stick with the yoga, try to nail down exactly what muscles may be tight, and address it that way. But if it's not preventing you from lifting, I probably wouldn't drop the deadlift. Keeping the movement, obviously with solid form, should strength the area (plus all the other goodness that comes from deads).
Fair enough. I did a little quick reading and it looks like certain aminos may exacerbate OCD symptoms, so there may be something to that approach. The unfortunate thing is that it's not ideal for building muscle or dropping fat.
You don't need a super-high protein intake for results, but .5g per pound of bodyweight is really pushing it. Definitely monitor your fat loss progress often and try making adjustments as needed (like you've said you plan to do anyhow).
If it's what worked for you in the past, then it kinda doesn't matter how I'd structure things. I was approaching it in terms of getting stronger and losing fat. If [i]the[/i] number one, above-all-else priority is getting the OCD back under control, then for sure do what you know works. When things open up a bit more and are more manageable, then maybe consider making a few changes to the plan.
Like all the guys in previous posts have said, it's best not to overthink things. Maybe I said too much in my earlier post. Given the choice between taking online advice that's 96% good or having a training partner live and in-person pushing you through sessions that are 83% good, I'll pretty much say to go with the in-person option everytime.