Don’t stress over whether your theme will survive past another WordPress update. We update our themes regularly with standards compliant code, not hacked together homebrew solutions.