Your little one is totally normal and wonderful I'm sure!! Napping for me was tough, too. No worries, it can be remedied, but you need to find what works for you and your little one.
I personally, don't believe in 'training' babies to do anything...especially sleep, it's one of those things that according to even Dr. Ferber shouldn't begin until around nine months. My son's Pediatrician recommended feeding on demand at least until my son was on solid foods for two months. And, once he was on the solids he was able to go for periods of 6-8 hours without waking up for feeding. Babies, in my opinion, should not be expected to sleep through the night yet. It's my philosophy that our jobs as parents is to help our kids in learning to do things for themselves, not train them...
As for naps, the only thing that worked for my son was to let him sleep on my bed. Once I gave in and let that happen, it was easy to get him to sleep for naps. I did have to Baby Proof my bed, and get a couple of rails for the sides, but it was great. I could get things done, and he slept for about an hour twice a day. I would say the night waking it probably a symptom of needing a routine, growth spurt, teething and just plain being a baby.
Routines, are tough to keep espcially when you get used to one and then, another stage pops up and it all starts over again!! Don't worry, it's tough but you'll get through it together.