Naturally, I broke it again.
Had stuff all over the place and just wasn't interested in restoring the backup.
Nice thing tho is that I hit the content types hard and I think I have everything "Right" this time.
Content Types and Fields, I'm going to write a pamphlet on "Things you Actually need to know about Drupal, and when you accept these things life is pretty easy, actually". But, I'll write that later.
Back to fighting with Bootstrap.