Oh man, that was pretty damn great. Mood whiplash all about.
One of the things I love about this show is how an issue isn't necessarily "over" just because an episode addressed it. You don't get over stuff like traumatic pasts just because you had a peptalk.
Sure, one's line of thought can be steered into something more positive, and a character getting stuff into the air can help alleviate mental pressure, but it isn't fixed.
Amethyst doesn't suddenly love herself just because her suspicions of being resented were alleviated, and Pearl isn't "getting over" Rose just yet either.
On another note, this episode pretty much confirms the Stevonnie shieldmaiden prediction even without any fusion happening.