hi, C..
well, i have to say that i commend you on your patience. now...don't yell at me, but my daughter (who is almost 6 months old) started sleeping thru the night at almost 3 months old. until then, though, it was almost hell on earth for us. the way we got her to this point is by sticking to her nighttime routine. around 6:00 to 6:30 (sometimes a little later)comes the bath, then the bottle, then sleep. now we squeeze in a couple of books after the bottle. she's usually asleep before 8:30, but mostly before 8:00.
before she slept thru the nite, though, we used to put her to bed around 7:00 or 8:00 and get her up for another bottle around 10:00 to 11:00 and she slept til around 3:00 am when she woke for another bottle. this time always varied, but you get the idea. well, we decided when she was around 3.5 months old to let her sleep thru the 10:00 to 11:00 feeding. it worked out great! she slept til almost 9:00 in the morning (that first and only time). i guess it was just her time to sleep thru the night.
her naps now are much like your son's (an hour here and an hour there). i definitely give her a nap around 4:00 or 5:00 because if she doesn't get a nap at that time, she gives us hell!
she just started to wake up around 5:00 am recently and i can tell she's still wants to sleep (her eyes are closed and she's rubbing them and putting her fingers in her mouth), so i go in there and give her a pacifier and she usually sleeps til 7:00 or 8:00 or she's up and plays until i go in and get her.
i know some people don't like to give their babies a paci, but maybe you can try that during his middle of the night wakings or maybe water? i think whatever you do, you have to be consistant. don't try to stick to specific times of the day, rather try to stick to a routine. it took me a long while to get myself to think that way. i was always for sticking to specific times.
all babies have their own ways of doing things. my baby girl still needs to be swaddled for a nap or for bed. otherwise she is all over the place and won't sleep. i'm going to try and go swaddle-less (one arm free at a time...hehe) after she turns 6 months. wish me luck!
good luck and let us know how things go. i would love to hear about the night when he sleeps all the way thru! i know it was a great moment for us when our little one finally did.