No, Subaru and Roswaal are different people.
Subaru has been dancing in the palm of Roswaal this entire time.
I have a suspicion that Emilia is Satella the witch of envy.
Finally Roswaal is starting to include Subaru into his schemes.
Roswaal Mathers is more than the clown that Subaru supposes him to be.