Options to replace old non-standard panel

So, my house was built in 1974 and has a Square D QO, split bus, main lug panel that is only 12 inches wide.
I'm currently remodeling and rewiring the crazy circuits in the house and would like to replace the panel with something more up-to-date. I was planning on installing the new plug-on neutral stuff, because it sounds cool and easier.

I'm currently planning on not pulling the meter when I do all of this, which I'm sure several people will balk at, but that is not the current discussion point.

So, as I see it I have three options:
1. Install a disconnect where my current panel is and re-locate my panel
2. Move the stud next to my panel to install a standard width panel
3. Leave my panel alone and just redo the circuits (not the preferred option)
I would like to stick with QO because I have several breakers that I can re-use, even if I'm upgrading adding Arc Flash breakers, and they seem to have a good track record, barring any previously perturbed trolls.

Just for some background, I've been an electrician on submarines in the Navy for a little over 14 years, so I'm not concerned with quality of work. I plan on doing the research to make sure it is to code, and have a licensed friend who has offered his expertise.