It sounds like you have a good start if he's falling asleep on his own at bedtime- good job!
I think that right now the best thing you can do is to become consistent. Either decide you're not ready and let him come to bed with you right away when he wakes, or really stick to your guns and only comfort him in his own crib without bringing him out- just as long as you're consistent! By giving in sometimes I think you make it harder for yourself the following nights. When I was GW and I would want to give in, I would just tell myself that if I did I'd have an even worse night the next night. It helped me stick to it!
Remember though, you don't have to move very fast. You can absolutely go over and comfort him at his crib (or do PD- or both- whatever you decide) until he falls asleep. Just remember to move to the next step of GW when you're ready so you don't get stuck comforting at his crib for the next year or so.
Something I did that helped was to try to think out little scenarios and what I would do if they became reality. Like: what if he stands, but doesn't cry? What if he bonks his head on the side of the crib? (it happened) Will I talk? What would I say? If he's laying down and crying do I stay in bed or go comfort? I'm sure you get the picture. Anyway, having a plan really helped.
If you're hoping to keep him in your room that's great! Who says he has to sleep in a different room? I really love BW, and think Tracy's ideas are great, but I use them more as a guide, not a rule book. For instance, I really love co-sleeping at first and have noticed it really helps my breastfeeding relationship. When that reaches a point where it's more hindrance than help we move to the next step. I have a couple good sleepers, so hopefully my advice is sound.
I hope that helps- sorry I took so long to respond!