bydesign, you probably already are aware, but there are a handful of S1654 conversions on Pirate4x4. I am in the process of doing one myself, and have similar plans for a layout. If nothing else, you should start a thread over there so those who have gone before you can chime in.
Sounds like...