As regards the shoulders, are you wanting to change the design to that similar to the SPI, or have the same design but shape it like an spi shoulder.
I started doingk on them today, but im happy to redo them if they arent what you had in mind. (Ive just followed the concept up to now as i wasnt clear on what you wanted)