This is Wrong because worship include what are known as the "pillars of Islam"  which is shahadah, salat, zakat, fasting and hajj. Apart from that whatever things we do with the intention of Allah is also an act of worship such as alms to the needy .

2) How can we make sure that our niyyah in our actions is good?

Before doing something, we need to set our intentions only on the one which is Allah SWT. Because when we make niyyah inshaAllah our mind will also do the job to make everything went well .With this we will be able to do something that can reward ourselves even if we do not know what reward is given by Allah. Therefore, whatever we do is a good and noble thing when accompanied by intention to Allah.

We can be sure of our own intentions. If our intention is good to do that then the deed is good while if our intention is bad then the deed we want to do later is evil. So, we need to be kind to everyone no matter how difficult or easy, beautiful or ugly someone is. And do not have a very bad nature that is with jealousy or envy.

The differences umrah and hajj is umrah is a voluntary but for hajj it’s compulsory to all muslims . that Allah stated in pillars of Islam. Hajj is performed over specific days during a designated Islamic month which is Dhu al-Hijjah. However, Umrah can be performed at any time. 

Can you explain what is taqwa? And what does it mean for one to be in a state of taqwa when performing Hajj and Umrah? 

Taqwa is an Islamic term for being concious and piety or fear of God. When we  performing Hajj and Umrah, we are truly convince to worshipping Allah and all of our sin is wiped clean as though we were a new Muslim. 

When the pilgrims return to their home countries after the journey of Hajj, they return spiritually refreshed, forgiven of their sins and ready to start life anew.

Pilgrims are doing their Hajj alwaysunder a hot sun .This part of Hajj serves as a reminder that as we have to been through to all the trials .