Yeah I sounds like you've got it correct.

Must still use 4" strut spacer
I would remove superlift coil spring preload spacer, regardless of which spring is used (unless more lift is desired and the 5100s are maxed out)