Because 70-059 and 70-087 do indeed count as electives (and it won't be until March or April that MS gets the whole transcript thing straightened out, according to recent stories in MCP magazine), and because 70-240 counts for 70-210, -215, -216, and -217, all you need to take to finish up your Win2K MCSE is one of the "designing exams." 70-221 will fit that bill, so the answer to your first question (70-240 for MCP) and your second question (MCSE in Win2k) are both "Yes."
Sounds like you found the easiest way through the upgrade maze. Congrats on passing 70-240.
This was first published in February 2002