You know, I started to think about that last night after I wrote this post. In the last scene the Architect sure acts like he was the one who made the deal with Neo. But he could be working for the sun-shaped machine. It's not clear either way, but you're probably right. In fact, maybe I should revise my post to reflect this.