Sounds like a solid plan. Before the deck make sure you leak test, replace rivets and seal up the seams.
The SC FB group is full of some really bad advice with only a few guys there that actually know what their doing. I pretty much stopped giving advice there because the guys with the easy...