Hi there - what you have described is not uncommon at all. We went through exact same thing. What your friend suggested is something that worked very well for us in the end. I shortened her nap to 45mins (then 30/20 until she refused to sleep in the morning) and had her take the afternoon nap approx 3hrs after nap1 ended. Some let their los take a long morning nap, slowly push it until it comes to midday and try to offer a catnap in the afternoon. Mine always resisted the catnap so that never worked for us.
I really wish I knew what to do about his waking up after being put to bed
I would say what he is doing (waking up at night, etc....) is from overtiredness. Stick to giving him 2 naps for now but limit the morning nap as you have done before. The nightwakings should dimish. To be honest, all I could do when she would wake after going to bed for the night was to do a modified version of wi/wo. I would wi, calm her down, pat her, etc... and then leave. If she started crying again, I would repeat the process. Try your best not to nurse because he might just start expecting that at every awakening. Try to soothe him in his cot. Don't pick him up, just do pd. Any way dh can help you out -he might go down for him a little easier.
We went from 2-1-2-1 naps for a long time (3 months) and it all depended on the time she woke up, how she "acted" in the morning and the kind of night she had. In any case, I always had to wake her up to get an afternoon nap in.
hth
Layla