"Which they will pry form my cold dead hands" Haha alright well it sounds like you should be good, are you going to be sharing the tent with another person?
Have you thought about making the jump the a tarp with an inner? If you can make a backpack you would have no problem making a tarp. Ripstop by the roll sell silnylon at a very reasonable price(no affiliation just a happy customer) Something to consider for future trips, if you don't feel like your current set up meet your backpacking goals.
Bear canisters are a pain but they keep our food safe and more importantly they keep the bears safe.