Tarot

[CRNDLSM]

I'm making my own tarot deck because I like numbers and symbols and not for any divination purposes.  Original tarot seems outdated, what are your thoughts on my structuring? I've regrouped it into 5 sets of four separating the fool and the world as beginning and end.  The police is the hierophant, the high priestess the teacher, the magician student, tower is the comet, the chariot the priest.  Maybe I can replace some other symbols.

Original:.                              Revised:

0 the fool                             the fool
1 the magician                   the sun
2 the high priestess           the king
3 the empress                    the queen
4 the emperor                     strength
5 the hierophant                 the star
6 the lovers                         the teacher
7 the chariot                       the student
8 strength                            judgement
9 the hermit                        the moon
10 the wheel of fortune    the lover
11 justice                            the hermit
12 the hanged man           temperance
13 death                              the comet
14 temperance                   the priest
15 the devil                         the police
16 the tower                        justice
17 the star                           the wheel of fortune
18 the moon                        the victim
19 the sun                            the devil
20 judgement                      death
21 the world                         the world

As far as the suits go I have:

Swords=guns=fire=summer
Cups=spoons=water=spring
Pentacles=hammers=earth=autumn
Wands=pens=air=winter
King=Elder (senior)
Queen=adult (master)
Knight=child (youth)
Page=baby  (infant)

I'm playing around with the words, what do you think, what changes would you make?