Welcome to BW! And Bravo for reading the book and getting started on a great plan. I think you're doing wonderful incorporating the BW system into your routine!
OK, well first at this age we do WI/WO (walk in/walk out) rather than PU/PD. I think we stop PU/PD around 8-9 months (but don't quote me on that!). I do know for sure that we switch after a year, so you'll want to read up on WI/WO. Essentially it just means you go in, calm (while they're in the crib, don't pick them up or out) and then walk out again. You go in everytime they cry. I think there may also be a timing thing too, where you wait a few seconds before going in, but this isn't a technique I've used so please check the WI/WO board to see.
However, we often recommend an alternative technique called "Gradual Withdrawal" in certain cases. This would be one of those cases! When trust has been broken, as you recognize, we need to let our child gradually get used to us leaving them to fall asleep independently. You've had an awesome start -- getting in the crib. And you're doing great recognizing that now it's time to be out of the crib! But instead of doing PU/PD, what I would do is get a chair and sit by his crib until he falls asleep. You can put your hand on him if you want, whatever makes him comfortable. If you *do* put your hand on him, the next step would be by the crib with no touching/interacting. If you *don't* put your hand on him, next step would be to put your chair a little farther from the crib, closer to the door. We're going to move you slowly until your chair is outside of the room, but door is still open, and then finally out of the room with door closed (partway or all the way, whatever your family is comfortable with). The length of time at each step depends on you. I like to recommend 3 days at each step. I find with just about every aspect of sleep training, 3 days is what it takes for a child to adjust. I know this sounds like a looooong committment, but girl you're going to be so happy when you're done! You're going to have a child who's happy in his room again, and can just be put to bed and then leave.
Of course, once you are *out* of the room (using GW), then you will use WI/WO if he still continues to cry when you leave. But I have a feeling that won't be an issue. We'll just have to wait and see!
Now, for the sleep routine. You did an excellent job bringing him back to 2 naps. I think that's probably a good idea for right now. At his age, though, we're going to slowly shorten that AM nap and bring it forward until we can get him on 1 nap. Average age for being on 1 nap is 15-16 months, so that isn't too far away. I'd leave him on the 2 right now because he seems to be doing good on it! And, what I think is happening at bedtime is you're missing his sleep window by about 30 minutes, which is why you see sleepy signs at 6:30, and then he has a hard time winding down. As you've read in BW, and OT (overtired) bub gets wound up and has a hard time falling asleep AND staying sleep. It also explains your 6 am wakings -- that's 10 hours of sleep, when he falls asleep at 8 pm. 10 hours is almost ALWAYS a sign of being OT.
So, I'd change your nighttime routine by 30 minutes, you'll want him IN BED no later than 6:30 (and I'd actually err on the side of earlier, since he's rubbing eyes by then). When a toddler shows sleepy signs, it almost always means you're IN the sleep window, and almost out of it! Babies give you some warning as they're entering the sleep window. Toddlers give you warnings as they're exiting sleep window, if at all. I know it's scary to put him down earlier since you're having such early wakings, but believe me, your chances are better of having a sleep in if you put him earlier than later! Besides, I think after a few more days of a routine like this, he may be ready to push that bedtime back out again. He's just tired from all the bedtime struggles you guys have been having.
WTG! Let me know how you get on, and please feel free to ask any questions! So glad you found us! We'll be getting both you and little guy sleep in no time!