I'd do numbers 5 & 7. Subdividing could be good as well depending on your figures, but I'm lazy and would probably just purchase more assets elsewhere for the time being without the hassle. :D
But please, whatever you decide - don't do this!:
Though re-reading your first couple paragraphs -...