I like your list.
My personal preference would actually drop every one of those items, but it's a well thought out list, and should cover most things very well.
My disagreement on the rifle and shotgun are simply my preference, but if that's what you want they should serve you well.
With more personal preference coming into play, I want to address one issue:
DON'T BUY A NEW MARLIN! They're crap. The lever actions, in particular. Remington doesn't know its [butt] from a doorknob, when it comes to the Marlin lever actions, and quality
continues to go down hill. (We thought it was improving, but it was cosmetic while they cheapened the materials and opened the tolerances for things like headspace!
)
If you want a Marlin 336 in .30-30, find one made prior to about 2005. (Letter serial number prefixes; or serial number prefixes ranging from 29 [1971] to 00, or 00 [backward] to 95 [2005], or 69 or 70 [1969 and 1970].)
Seriously. Please. Do NOT buy a current-manufacture (or recent manufacture) Marlin 336. They are absolute garbage.
Easy giveaways of post-Remington rifles are "MR" and "SR" serial number prefixes, and/or a "QR code" style square barcode engraved on the receiver.
Qualification/quantification: I love working on Marlin lever actions. They may be my favorite action design, and the pre-Remington rifles are quality firearms. I'm even looking into getting an FFL, in order to start doing my custom work professionally. But...
The Remington-built Marlins are the lowest form of garbage I have ever seen from a domestic "quality" manufacturer.
Please. For the love of god, buy a used one.
Heck, if I have to, I'll discuss selling you my 1970 Glenfield Model 30. The Glenfields are "store brand" Marlin 336s with cheaper stocks; but just as well built.