You are correct.  The SCOTUS ruled that the Individual Mandate qualified as a tax.  That was what I stated in my comment above.  There's a lot more to Obamacare than the mandate.  But to answer your question, of course congress can amend or repeal any portion of the Act.