I think that all of your proposed modifications sound great, nice job! I'm looking forward to seeing your finished product!