It sounds like you've worked out a good plan. The only thing I would suggest is that you might want to give the 6-mp a little more time if you go that route. It takes a couple of months for this drug to reach full effect. Seven weeks might not be enough time to know if it's going to help him or not.
Good luck to you both.