Hi Charjanmom, I only changed set nap times when the morning nap went down to 40 mins. I know conventional wisdom is that under 1hr20 is UT but I have found with my LO she can do 1:20 or 1:10 one day, then I have to wake her at 1:30 the next so it seems to be more of a normal blip than an indication that she needs a routine change. With a 1:20 nap I would just keep the afternoon nap time the same. That said, I cap the naps at 1:30 so 1:20 isn't a big deal but I guess it's a whole sleep cycle if your LO normally does 2hr.
Crying after bath when getting dressed... yep, I think that's pretty normal. We've had that for almost a year ;-)