Sorry for the delay in replying
How have things been the past couple of days? Hope LO is over his cold now.
So you think discomfort could be playing a part in the short naps? Gassiness, reflux?
http://babywhispererforums.com/index.php?topic=654.0 Has he ever done long naps? Do you try to extend?
If there's no discomfort, I think the first nap of the day is probably UT...but he gets OT from then on in. I would try to extend that first A by 15 mins - do something interesting but low-key for the end of the A time, such as walk around the garden, or say goodbye to his soft toys etc. If you get a longer nap, try the same A time again. If it's still short and he's waking happy, you may need to extend a little more. And if the nap's short, do reduce the next A time a bit as you have been doing. This may mean the next E is before S, but try to have a short A in between (even if it's just a nappy change or wind-down routine). It's ok if you have to bring the feed forward a bit to achieve this!
The NWs in the early part of the night sound like OT, from all the short naps. Not sure if your LO is bf or ff, but it is still normal for a bf baby to have 1-2 NFs at this age - but if he goes 3 hours between feeds during the day, he should be able to do that at night too. Does he need his dummy to fall asleep? This could be a prop issue.
I am not aure if I should have the white noise on or can that be considered a prop?
No, white noise is fine - a prop is something that requires you to be there, so rocking, re-plugging a dummy, etc. My LO still has white noise on for her nap and all night, at 17 months - it's great for blocking out the sound of the noisy neighbours!