Yes I'd concentrate on the first one for now and see how it goes. Maybe keep at the new A time for 3 days, that'll give you a good idea. If you extend it slightly and perhaps try w2s again at the 30mi s mark? Do remember though, short naps can be developmental at this age so sometimes there's not a lot we can do. As long as you've tried everything, you can be sure it's because of that and not just because it's UT. I'm afraid it's all a guessing game at this stage x