Blake Lively 180 switch? [spoiler]

So, when Blake Lively was first called in, did anyone else feel he was being brought in as some type of secret agent? Like "The Beekeper" or "The Kingman" but as "The Plumber?" by Will. But then Freddie said, "nah fuck that" and made him a LITERAL PLUMBER?

Every time I listen to a new episode this gnaws at me as something that was planned, and switched, but has never been called out.