Your first suggestion is what I was just looking at doing.
Your second suggestion is what I would do. If it were my website. And I know what I’m doing is going to change about 5 more times. Thus I’m not going to rush to do the graphics. But I agree. That is the best option and where I may end up going in the end. Once it stops changing.