The bug I saw was neither of those, but we do have both here in our gardens.
The one I saw on the chrysalis looked a lot like this one
http://www.fcps.edu/islandcree... .
Currently, both of the remaining chrysalis are in their dark stage, but they've been that way for weeks now. I'll check closely today to see if I can visibly detect any abnormal signs without opening them.
