Focus on calming the evening fussiness first. If you're not swaddling him, start doing it. Swaddle him, place him in your arms facing you (so he is in a side-lying position), give him a nice loud 'shush' close to his ear, then do your walking around the house (or even bust out the swing - he'd probably respond very well to that). After about 1-3 times of doing this routine you will find that he will likely calm down and stop the fussiness immediately.
Any sort of calming or soothing routine needs to begin within 1-2 hours of the baby being awake. He's likely having problems falling asleep at night because the poor little guy is so fried from being awake so long. So, around 6:00 start soothing him down. He probably won't fall asleep right away but he probably won't need to be walked around 30 minutes. Help him to be calm and peaceful as opposed to overtired.
If he's not hungry but looking for comfort, use the breast, finger, or pacifier for soothing. This is NOT a bad habit; this is an essential soothing technique that newborns use to calm themselves.
There's nothing that says you can't put him down awake now. If he's soothed and calm, then by all means, put him down drowsy but awake. My son is only 3 weeks and even though he gets up 3-4 hours at night to feed, as soon as we're done eating, I take about 5-10 minutes to pack him back in the swaddle, let him lay tummy-to-tummy, give him his pacifier, and then put him in his crib. He's off to comfy-comfy land and puts himself to sleep; I don't have to rock him for endless hours trying to calm him down. Teach your son how to fall asleep drowsy but awake NOW and once he starts becoming more social (around 6 weeks), he'll still remember these wonderful skills you taught him (self-soothe to sleep) and be able to do it all on his own.
It's a good idea to start thinking and planning now, but realistically (and physiologically) good solid patterns might not appear until 3-4 months of age. Work on the morning nap first, then the afternoon nap - with whatever techniques you'd like. At this time, the body's circadian rhythms are synching and appropriate chemicals (melatonin, etc.) are being released to tell the brain 'wake time' and 'sleep time'.