Well done!
My only comment would be to invest in new nipples when doing the rim swap two step, but it looks like you made the old ones work just fine.
__________________
If someone tells you that you have enough bicycles and you don't need any more, stop talking to them. You don't need that kind of negativity in your life.