One of the good things about your current idea of the JJ-refit is that I linke how the neck is more of an evolution of the JJ-prise than the TMP refit. Fits a lot better, in my opinion.
One idea for the phaser batteries instead of having them be sets of two, how about sets of four?
I'd love to see how this turns out!