So my hopes of completing this project by June won't be fulfilled, but I do have the bulk of this project completed as of now.
I trimmed the Wii and it went smoothly aside from a U10 that didn't work until I replaced it. For the original Waker, the trim had to be a maximum OMGWTF trim, but...