Sunni or Shiah way of salaat is perfectly fine. In fact that is still how I pray. I agree that it does not matter how you perform your salaat. What is in your heart is what is important. However, I believe the whole 'remodification' of salat thing would only add to division among muslims. If everybody had different way of salat, we could no longer go pray standing as high and bowing as low together at the mosques. Therefore, I think it is better for us to preserve Sunni way of salat.
peace
In my openion there is no problen in praying in sunni way if you omit ameen" and Tashahud from it.
!