Advice for future-proofing?

Sounds good on both fronts. Thank you!