Doug, I have very limited time right now for the board but wanted to come here RE your PM to me. To me it looks like you have a good starting ground for your macros. It's pretty hard to screw them up based on the straight forward way it is written out in AARR. Go with this plan for awhile and see where it gets you. A couple o' things overall...
1. Glad you are not worried about muscle loss anymore so much. I mean it really is sort of hard to do from your stand point.
2. Don't focus on scale loss either quite so much. If the scale stalls for 2 weeks it doesn't mean that your body has adapted to anything. It means you have a woosh coming up.
If the scale doesn't move but your clothes fit better than you are doing EXACTLY what you want to do.... "culking" (see the AARR if you don't know what the is) If the scale stalls for a month and you aren't really sure that you are counting cals correctly, then you can cut back some (BUT KEEP THE SAME PROGRAM)
3. Stick to ONE program where you can accurately measure your progress over the next 6 months. It will help you overall understand what is happening because BF% measuring devices all suck. This is the thing that will assure you that you are gaining muscle more than anything.
Good luck with it.