Nice progress so far. For the rotor you could use an M16 1.5 bolt. Thread it in tight, heat rotor with propane and whack the bolt with a hammer. Should pop right off.
If you want, have a look at my build thread. In the table of contents there's a link to the rotor removal. Mine seemed much more stubborn than most. Heat might not even be required.