I think this thread got hijacked, but yeah, a T2 swap is the way to go. That is what I am doing on my 7