Great to hear you've had some success with naps, well done
Yes, do what you need to do for your wind down, that's just right - responding to your individual LO and respecting what he needs and wants is just what Tracy would encourage you to do
Shh pat should help with night wakings if the daytime routine is good, but it's quite likely that he may be OT by BT with all those short naps, none of which would be very restorative. Don't worry it's really common at this age, but I think that working on the daytime routine and getting some longer naps in could help with the nights. Does he tend to wake at the same sorts of times at night? Ie during the first few hours after BT, or is it later on in the night, or just spread throughout?
Just to get an idea about what changes he may need to his routine, let's start with the first A time and first nap, and take it from there? How long has he been doing 2h10mins first A time? Has he ever done a longer nap, and if so, what A time did he do before it? What happens when he wakes at 35mins? Is he crying/fussing/screaming/making happy sounds? How long do you try to resettle him for? How does he react when you do so, does he seem like he might want to go back to sleep, is he yawning between cries, etc? When you get him up after a short nap, does he seem happy, or still tired and like he would have benefitted from some more sleep? I'm just trying to gauge whether he needs that A time pulling back a bit if he's OT (which can cause short naps of around 35mins or even less) or extended if he's UT (which can also cause short naps...) - wdyt? My hope is that once we get an idea of what A time he needs for a good first nap, we can use that knowledge to lengthen his other naps, and get him better rested during the day so that he sleeps better at night.
In the meantime, are there any props you can use, even just for one nap a day (don't worry about affecting sleep training, it sounds like he's making good progress there), to help him to get a nice long nap and so catch up on OT after the short naps? I relied on being able to do this in the sling with both of mine, it helped my sanity too
Let me know how it goes with the w2s, you'll need to keep it up for a few days so don't give up if it doesn't work straight away. I never had great success resettling after short naps, but kept at it all the same and sometimes it paid off when they got back off again for another 45mins or longer - it was worth it just for those times, and ultimately they both learned how to take longer naps by themselves