Hi Becky,
I always had the reverse problem with Colin - he was a great napper but nights were horrid! As he is spirited sleep was always a big challenge as is normal with spiriteds and touchies. I wouldn't recommend WI/WO as it's really for older babies anyway but sometimes, like PU/PD, it backfires for those temperments.
What do you do at nighttime? Anything different?
Traditional sshhhh/pat didn't work for us either. The patting made Colin mad and wound him up, plus he had reflux. We did a shhh/hold instead. One arm laying across his chest and the other across his knees. It worked great and we did that for a looooong time!